接口测试修改

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -16,6 +16,7 @@ public class UseIntegral implements Serializable {
     private Integer integralId;          //ID
     private String userOpenId;              //用户openid
     private Integer integralType;                //积分类型
+    private Integer stayId;                //待入账积分ID
     private Integer integralNumber;      //使用积分数量
     private Integer configId;            //积分来源类型
     private Integer integralBeforeNumber;//变动前可用积分总额
@@ -115,4 +116,12 @@ public class UseIntegral implements Serializable {
     public void setPage(PageBean page) {
         this.page = page;
     }
+
+    public Integer getStayId() {
+        return stayId;
+    }
+
+    public void setStayId(Integer stayId) {
+        this.stayId = stayId;
+    }
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/apparatus/ApparatusServiceImpl.java

@@ -123,9 +123,6 @@ public class ApparatusServiceImpl implements ApparatusService {
             return false;
         }
         IntegralConfig integralConfig = null;
-        IntegralConfig registeredConfig = null;
-        IntegralConfig buyConfig = null;
-        IntegralConfig newConfig = null;
         StayIntegral stayIntegral = new StayIntegral();
         Integer stayNumber = 0;
         Calendar calendar = Calendar.getInstance();
@@ -135,8 +132,8 @@ public class ApparatusServiceImpl implements ApparatusService {
                 integralConfig = getIntegralId(247);
                 stayNumber = integralConfig.getIntegralConfigNumber();
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                registeredConfig = getIntegralId(251);
-                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+registeredConfig.getIntegralConfigNumber());
+                ShopSystemRule registeredSystemRule=systemMapper.selectOneShopRuleById(251);
+                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+registeredSystemRule.getRuleNum().intValue());
                 stayIntegral.setStayRecordedTime(calendar.getTime());
                 break;
             case 2:
@@ -144,8 +141,8 @@ public class ApparatusServiceImpl implements ApparatusService {
                 integralConfig = getIntegralId(248);
                 stayNumber = integralConfig.getIntegralConfigNumber();
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                newConfig = getIntegralId(251);
-                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+newConfig.getIntegralConfigNumber());
+                ShopSystemRule addToothRule=systemMapper.selectOneShopRuleById(251);
+                calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+addToothRule.getRuleNum().intValue());
                 stayIntegral.setStayRecordedTime(calendar.getTime());
                 break;
             case 3:
@@ -156,7 +153,6 @@ public class ApparatusServiceImpl implements ApparatusService {
                 stayNumber = orderAllIntegral;
                 stayIntegral.setOrderId(orderId);
                 //规则表查询新注册会员和新增牙刷积分到账时间（多少天到账）
-                buyConfig = getIntegralId(252);
                 ShopSystemRule shopSystemRule=systemMapper.selectOneShopRuleById(252);
                 Integer day = shopSystemRule.getRuleNum().intValue();
                 calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+day);
@@ -184,6 +180,7 @@ public class ApparatusServiceImpl implements ApparatusService {
                 useIntegral.setConfigId(integralConfig.getIntegralConfigId());
                 useIntegral.setUserOpenId(openId);
                 useIntegral.setIntegralType(3);
+                useIntegral.setStayId(stayIntegral.getStayId());
                 useIntegral.setIntegralNumber(stayNumber);
                 useIntegral.setIntegralBeforeNumber(memberInfo.getUserSurplusIntegral());
                 useIntegral.setIntegralEndNumber(memberInfo.getUserSurplusIntegral());

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

@@ -123,7 +123,7 @@
 		VALUES 
 		(
 			#{couponItemId},#{couponId},#{couponItemUseropenid},#{couponItemCurrentUserOpenid},#{couponUseEndDate},
-			NOW(),#{couponUseStatus},#{couponUseDate},#{couponIsDonation},#{couponItemRemark}
+			NOW(),#{couponUseStatus},#{couponIsDonation},#{couponUseDate},#{couponItemRemark}
 		)
  	</insert>
  	

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/memberMapper.xml

@@ -364,7 +364,7 @@
 		</if>
 	</select>
 
-	<insert id="insertStayIntegral" parameterType="StayIntegral">
+	<insert id="insertStayIntegral" parameterType="StayIntegral"  useGeneratedKeys="true" keyProperty="stayId">
         INSERT INTO tb_iamberry_stay_integral (user_openid,config_id,sales_orderid,stay_number,stay_recorded_time,stay_status,stay_remark)
         VALUES
          (#{userOpenId},#{configId},#{orderId},#{stayNumber},#{stayRecordedTime},#{stayStatus},#{stayRemark})

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -76,6 +76,7 @@
         (
           user_openid,
           integral_type,
+          stay_id,
           config_id,
           integral_number,
           integral_before_number,
@@ -85,7 +86,7 @@
         )
         VALUES
         (
-          #{userOpenId},#{integralType},#{configId},#{integralNumber},
+          #{userOpenId},#{integralType},#{stayId},#{configId},#{integralNumber},
           #{integralBeforeNumber},#{integralEndNumber},#{integralRemark},NOW()
         )
     </insert>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -119,7 +119,7 @@ public class ApparatusHandler {
         }
         JSONObject machineJson = JSONObject.fromObject(json);
         JSONObject message = machineJson.getJSONObject("message");
-        String isBeing = message.getString("message");
+        String isBeing = message.getString("isBeing");
         if(isBeing.equals("1")){
             String productId = message.getString("productId");//产品id
             productColorId = apparatusService.getColorIdByProductId(productId);
@@ -133,7 +133,7 @@ public class ApparatusHandler {
         apparatus.setUserOpenid(memberInfo.getUserOpenid());
         apparatus.setApparatusBuyDate(format.parse(buyDate));
         apparatus.setApparatusWarrantyDate(updateDate(format.parse(buyDate),renewRule.getRuleNum().intValue()));
-        apparatus.setApparatusStore(Integer.getInteger(apparatusStore));
+        apparatus.setApparatusStore(Integer.valueOf(apparatusStore));
         //注册会员
         boolean flag = apparatusService.registerMember(apparatus,member);
         if (flag) {

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -516,11 +516,13 @@ public class CouponTypeHandler {
 	 * @param request
 	 * @return
 	 */
+	@ResponseBody
 	@RequestMapping("/getIsReceive")
 	public ResultMsg getIsReceive(HttpServletRequest request){
 		ResultMsg resultMsg = new ResultMsg();
-		Member memberInfo = WechatUtils.getUserBySession(request);
-		Integer msg = couponItemService.getIsReceive(memberInfo.getUserOpenid());
+		/*Member memberInfo = WechatUtils.getUserBySession(request);*/
+		/*Integer msg = couponItemService.getIsReceive(memberInfo.getUserOpenid());*/
+		Integer msg = couponItemService.getIsReceive("o-icas0dRzE7WYAEAmcX4BQCUyFo");
 		if(msg > 0){
 			resultMsg.setResultCode(ResultInfo.ERRORCODE);
 			resultMsg.setStatus(false);
@@ -538,12 +540,15 @@ public class CouponTypeHandler {
 	 * @param request
 	 * @return
 	 */
+
+	@ResponseBody
 	@RequestMapping("/addAewPeople")
 	public ResultMsg addAewPeople(HttpServletRequest request){
 		ResultMsg resultMsg = new ResultMsg();
-		Member memberInfo = WechatUtils.getUserBySession(request);
+		/*Member memberInfo = WechatUtils.getUserBySession(request);*/
 		CouponType couponType = new CouponType();
 		couponType.setCouponIsNewPeople(1);
+		couponType.setPage(new PageBean());
 		List<CouponType> couponTypeList = couponTypeService.getCouponTypeList(couponType);
 		if(couponTypeList == null || couponTypeList.size() < 1){
 			resultMsg.setResultCode(ResultInfo.ERRORCODE);
@@ -554,11 +559,11 @@ public class CouponTypeHandler {
 		CouponItem couponItem = new CouponItem();
 		couponItem.setCouponId(couponTypeList.get(0).getCouponId());
 		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(new Date());
-		calendar.set(Calendar.YEAR,1);
+		calendar.add(Calendar.YEAR,1);
 		couponItem.setCouponUseEndDate(calendar.getTime());//领取后一年有效
 		couponItem.setCouponReceiveDate(new Date());
-		couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());
+		/*couponItem.setCouponItemUseropenid(memberInfo.getUserOpenid());*/
+		couponItem.setCouponItemUseropenid("o-icas0dRzE7WYAEAmcX4BQCUyFo");
 		couponItem.setCouponUseStatus(1);
 		couponItem.setCouponIsDonation(2);
 		couponItem.setCouponItemRemark("新人优惠券");

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -19,6 +19,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -36,7 +37,7 @@ public class QrCodeHandler {
     public void getQrCode(@PathVariable("qrCode") String qrCode, HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
         res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);
     }
-
+    @ResponseBody
     @RequestMapping("/getMember")
     public ResultMsg getMember(HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
         ResultMsg msg = new ResultMsg();
@@ -58,7 +59,7 @@ public class QrCodeHandler {
         }
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
-        Map<String,Object> map = null;
+        Map<String,Object> map = new HashMap<String, Object>();
         map.put("memberInfo",memberInfo);
         map.put("isActivation",isActivation);
         msg.setData(map);