修改

YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -88,7 +88,7 @@ public class AppUserInfoController {
         ResultData resultData=null;
         try{
             AppUserInfo appUserInfo =new AppUserInfo();
-            CustomerPoints customerPoints =  new CustomerPoints();
+            //CustomerPoints customerPoints =  new CustomerPoints();
             String openId = "";     //此参数用于查询该用户是否已注册过
             if(request.getUserType()!=null){
                 //1-微信公众号
@@ -97,23 +97,23 @@ public class AppUserInfoController {
                     appUserInfo.setBlogToken(request.getBlogToken());
                     openId = request.getBlogOpenid();
                     appUserInfo.setBlogOpenid(openId);
-                    customerPoints.setBlogOpenId(openId);
+                    //customerPoints.setBlogOpenId(openId);
                  //2-微信小程序
                 }else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())){
                     appUserInfo.setUserType(request.getUserType());
                     appUserInfo.setMinaToken(request.getMinaToken());
                     openId = request.getMinaOpenid();
                     appUserInfo.setMinaOpenid(openId);
-                    customerPoints.setMinaOpenId(openId);
+                    //customerPoints.setMinaOpenId(openId);
                 }
             }
             if(StringUtils.isNotBlank(request.getBlogNickName())){
                 appUserInfo.setBlogNickName(request.getBlogNickName());
-                customerPoints.setCustomerName(request.getBlogNickName());
+                //customerPoints.setCustomerName(request.getBlogNickName());
             }
             if(StringUtils.isNotBlank(request.getMobilePhone())){
                 appUserInfo.setMobilePhone(request.getMobilePhone());
-                customerPoints.setMobilePhone(request.getMobilePhone());
+                //customerPoints.setMobilePhone(request.getMobilePhone());
             }
             if(StringUtils.isNotBlank(request.getBlogProfilePhoto())){
                 appUserInfo.setBlogProfilePhoto(request.getBlogProfilePhoto());
@@ -124,11 +124,11 @@ public class AppUserInfoController {
             appUserInfo.setUnionId(request.getUnionId());
 
             //customerPoints.setCreateTime(new Date());
-            customerPoints.setUnionId(request.getUnionId());
-            customerPoints.setPoints(0);
-            customerPoints.setConsumptionPoints(0);
-            customerPoints.setAccumulatePoints(0);
-            customerPoints.setInvalidPoints(0);
+//            customerPoints.setUnionId(request.getUnionId());
+//            customerPoints.setPoints(0);
+//            customerPoints.setConsumptionPoints(0);
+//            customerPoints.setAccumulatePoints(0);
+//            customerPoints.setInvalidPoints(0);
 
             if(StringUtils.isNotBlank(request.getSexFlag())){
                 appUserInfo.setSexFlag(request.getSexFlag());

YijiaRestful/src/main/resources/mapper/IntegralWaresMapper.xml

@@ -34,6 +34,9 @@
       <if test="stationId !=null and stationId !=''">
          station_id = #{stationId}
       </if>
+      <if test="waresStatus !=null and waresStatus !=''">
+        AND wares_status = #{waresStatus}
+      </if>
     </where>
   </select>