优惠码

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -19,8 +19,9 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 自定义去除的路径
-        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tJoinpayMchCheck/**",
-                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/sysRoleMenu/**","/tEquipmentApply/**","/api/**","/error"};
+        String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**","/tJoinpayMch/**","/tLogo/**",
+                "/tProportion/**","/tEquipment/**", "/tProportionCheck/**", "/tProduct/selectProductList",  "/rabbitMqController/**","/tJoinpayMchCheck/**","/indexController/**","/sysRoleMenu/**",
+                "/tEquipmentApply/**","/api/**","/error"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

src/main/java/com/szwl/controller/TAdminController.java

@@ -408,7 +408,8 @@ public class TAdminController {
             //默认是商家
             admin.setType(2);
             admin.setIsAdmined(true);
-            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
+            admin.setPassword(admin.getPassword());
+//            admin.setPassword(DigestUtils.md5Hex(admin.getPassword()));
             boolean b = tAdminService.save(admin);
 
             tMessageCodeService.saveOrUpdate(tMessageCode);

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -70,7 +70,7 @@ public class TEquipmentController {
      */
     @ApiOperation(value = "查找机器列表")
     @PostMapping("/findList")
-    public ResponseModel<IPage<?>> checkForgetCode(Long id, String clientId, String adminName, String equipmentName, String areaName, String eqeStatus, String machineType, String equimentType, String channel,long current,long size ) {
+    public ResponseModel<IPage<?>> findList(Long id, String clientId, String adminName, String equipmentName, String areaName, String eqeStatus, String machineType, String equimentType, String channel,long current,long size ) {
 
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         TAdmin admin = tAdminService.getById(id);

src/main/java/com/szwl/controller/TJoinpayMchCheckController.java

@@ -110,7 +110,7 @@ public class TJoinpayMchCheckController {
             return R.fail("没有审核信息");
         }
     }
-    @PostMapping("/selectOne")
+    @GetMapping("/selectOne")
     public ResponseModel<?> selectOne(Long id, String type) {
         if(StringUtils.isNotEmpty(type)){
             if(type.equals("0")){

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TJoinpayMch;
 import com.szwl.model.entity.TJoinpayMchCheck;
+import com.szwl.model.param.mchParam;
 import com.szwl.service.TAdminService;
 import com.szwl.service.TJoinpayMchCheckService;
 import com.szwl.service.TJoinpayMchService;
@@ -23,6 +25,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.xml.crypto.Data;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -110,7 +114,12 @@ public class TJoinpayMchController {
             tJoinpayMch.setStep("0");
 
             String result = tJoinpayMchService.createMch(tJoinpayMch);
-            return R.ok(tJoinpayMch);
+            if(result.equals("ok")){
+                return R.ok(tJoinpayMch);
+            }else {
+                return R.fail(ResponseCodesEnum.C0001,result);
+            }
+
         }
     }
     @ApiOperation(value = "签约")
@@ -123,26 +132,41 @@ public class TJoinpayMchController {
     }
     @ApiOperation(value = "上传图片")
     @PostMapping("/sentImage")
-    public ResponseModel<?> sentImage(String id,String cardPositive,String cardNegative,String tradeLicence,String openAccountLicence,String type,String status) {
-        TJoinpayMch mch = tJoinpayMchService.getById(id);
-        if(type.equals("0")){
+//    public ResponseModel<?> sentImage(String id,String cardPositive,String cardNegative,String tradeLicence,String openAccountLicence,String type,String status) {
+    public ResponseModel<?> sentImage(@RequestBody mchParam tJoinpayMch) {
+        TJoinpayMch mch = tJoinpayMchService.getById(tJoinpayMch.getId());
+        if(tJoinpayMch.getType().equals("0")){
             //对公
-            if(cardPositive==null||cardNegative==null||tradeLicence==null){
+            if(StringUtils.isEmpty(tJoinpayMch.getCardPositive())||StringUtils.isEmpty(tJoinpayMch.getCardNegative())||StringUtils.isEmpty(tJoinpayMch.getTradeLicence())){
                 return R.fail("图片不能为空");
             }
-            String str = tJoinpayMchService.sendCardBusiness(mch,cardPositive,cardNegative,tradeLicence,openAccountLicence,status);
-            R.ok(str);
+            String str = tJoinpayMchService.sendCardBusiness(mch,tJoinpayMch.getCardPositive(),tJoinpayMch.getCardNegative(),tJoinpayMch.getTradeLicence(),tJoinpayMch.getOpenAccountLicence(),tJoinpayMch.getStatus());
+            return R.ok(str);
         }
-        if(type.equals("1")){
+        if(tJoinpayMch.getType().equals("1")){
             //个人
-            if(cardPositive==null||cardNegative==null){
+            if(StringUtils.isEmpty(tJoinpayMch.getCardPositive())||StringUtils.isEmpty(tJoinpayMch.getCardNegative())){
                 return R.fail("图片不能为空");
             }
-            String str = tJoinpayMchService.sendCard(mch,cardPositive,cardNegative,status);
-            R.ok(str);
+//            String  cardNegative = replit(tJoinpayMch.getCardNegative());
+//            String cardPositive = replit(tJoinpayMch.getCardPositive());
+            String str = tJoinpayMchService.sendCard(mch,tJoinpayMch.getCardPositive(),tJoinpayMch.getCardNegative(),tJoinpayMch.getStatus());
+            return R.ok(str);
         }
         return R.ok();
     }
+
+    private String replit(String cardNegative) {
+        Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+               /*\n 回车(\u000a)
+                \t 水平制表符(\u0009)
+             \s 空格(\u0008)
+            \r 换行(\u000d)*/
+        Matcher m = p.matcher(cardNegative);
+        cardNegative = m.replaceAll("");
+        return cardNegative;
+    }
+
     @ApiOperation(value = "获取提现信息")
     @GetMapping("/getMch")
     public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
@@ -224,5 +248,7 @@ public class TJoinpayMchController {
             return R.ok(joinpayMchCheck);
         }
     }
+
+
 }
 

src/main/java/com/szwl/controller/TProductController.java

@@ -4,16 +4,21 @@ package com.szwl.controller;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.gexin.fastjson.JSON;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.szwl.model.entity.TAdmin;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TProduct;
 import com.szwl.model.entity.TPromoCode;
+//import com.szwl.model.page.Pageable;
+import com.szwl.model.page.TProductPageable;
+import com.szwl.model.query.TEquipmentParam;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.service.TAdminService;
 import com.szwl.service.TEquipmentService;
@@ -157,7 +162,35 @@ public class TProductController {
         TProduct tProduct = list.get(0);
         return R.ok(tProduct);
     }
-
+    @ApiOperation(value = "查询商品列表信息")
+    @PostMapping("/selectProductList")
+    public ResponseModel<IPage<TProduct>> selectProductList(@RequestBody TEquipmentParam param) {
+//    public ResponseModel<List<TProduct>> selectProductList(@RequestParam(value = "clientId")String clientId,@RequestParam(value = "current") long current, @RequestParam(value = "size") long size) {
+        if(StringUtils.isEmpty(param.getClientId())){
+            return null;
+        }
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId,param.getClientId());
+        List<TEquipment> list = tEquipmentService.list(query);
+        if(list.size()>0){
+            TEquipment equipment = list.get(0);
+            LambdaQueryWrapper<TProduct> query1 = Wrappers.lambdaQuery();
+            query1.eq(TProduct::getEquipmentId,equipment.getId());
+//            List<TProduct> list1 = tProductService.list(query1);
+            Page<TProduct> page = new Page<>(param.getCurrent(), param.getSize(), true);
+            IPage<TProduct> iPage = tProductService.page(page, query1);
+//            TProductPageable pageable = new TProductPageable();
+//            pageable.setCurrent(iPage.getCurrent());
+//            pageable.setPages(iPage.getPages());
+//            pageable.setRecords(iPage.getRecords());
+//            pageable.setSize(iPage.getSize());
+//            pageable.setTotal(iPage.getTotal());
+//            return R.ok(pageable);
+//            return pageable;
+            return R.ok(iPage);
+        }
+        return null;
+    }
     @ApiOperation(value = "查询商品列表信息 下拉列表查询")
     @GetMapping("/getProducts")
     public ResponseEntity<?> getProducts(String adminId){

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -38,6 +38,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static com.szwl.constant.ResponseCodesEnum.A0001;
+import static com.szwl.constant.ResponseCodesEnum.A0002;
 
 /**
  * <p>
@@ -83,6 +84,19 @@ public class TPromoCodeController {
         List<TPromoCode> list = promoCodeService.list(query);
         return R.ok(list.get(0));
     }
+    @ApiOperation(value = "小程序获取优惠码")
+    @GetMapping("/getCode")
+    public ResponseModel<TPromoCode> getCode( String  code) {
+        LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
+        query.eq(TPromoCode::getCode,code);
+        List<TPromoCode> list = promoCodeService.list(query);
+        if(list.size()>0){
+            TPromoCode tPromoCode = list.get(0);
+            return R.ok(tPromoCode);
+        }else {
+            return R.fail(A0002,"没有找到优惠码");
+        }
+    }
     @ApiOperation(value = "修改优惠码")
     @GetMapping("/updatePromoCode")
     public void updatePromoCode(@RequestParam(value = "id")String id, @RequestParam(value = "type")String type) {

src/main/java/com/szwl/controller/TProportionCheckController.java

@@ -130,9 +130,9 @@ public class TProportionCheckController {
                 tProportion.setAgencyId(tProportionCheck.getAgencyId());
                 tProportion.setMerchantId(tProportionCheck.getMerchantId());
                 tProportion.setPersonageId(tProportionCheck.getPersonageId());
-                tProportion.setAgencyProportion(tProportion.getAgencyProportion());
-                tProportion.setMerchantProportion(tProportion.getMerchantProportion());
-                tProportion.setPersonageProportion(tProportion.getPersonageProportion());
+                tProportion.setAgencyProportion(tProportionCheck.getAgencyProportion());
+                tProportion.setMerchantProportion(tProportionCheck.getMerchantProportion());
+                tProportion.setPersonageProportion(tProportionCheck.getPersonageProportion());
                 tProportion.setAgencyName(tProportionCheck.getAgencyName());
                 tProportion.setMerchantName(tProportionCheck.getMerchantName());
                 tProportion.setPersonageName(tProportionCheck.getPersonageName());
@@ -154,9 +154,9 @@ public class TProportionCheckController {
                 tProportion.setAgencyId(tProportionCheck.getAgencyId());
                 tProportion.setMerchantId(tProportionCheck.getMerchantId());
                 tProportion.setPersonageId(tProportionCheck.getPersonageId());
-                tProportion.setAgencyProportion(tProportion.getAgencyProportion());
-                tProportion.setMerchantProportion(tProportion.getMerchantProportion());
-                tProportion.setPersonageProportion(tProportion.getPersonageProportion());
+                tProportion.setAgencyProportion(tProportionCheck.getAgencyProportion());
+                tProportion.setMerchantProportion(tProportionCheck.getMerchantProportion());
+                tProportion.setPersonageProportion(tProportionCheck.getPersonageProportion());
                 tProportion.setAgencyName(tProportionCheck.getAgencyName());
                 tProportion.setMerchantName(tProportionCheck.getMerchantName());
                 tProportion.setPersonageName(tProportionCheck.getPersonageName());

src/main/java/com/szwl/controller/TProportionController.java

@@ -174,7 +174,7 @@ public class TProportionController {
         query1.eq(TEquipment::getClientId,tProportion.getClientId());
         List<TEquipment> equipmentList = tEquipmentService.list(query1);
         if(equipmentList.size()<=0){
-            R.fail("找不到该机器！");
+            return R.fail("找不到该机器！");
         }
         TEquipment equipment = equipmentList.get(0);
         //查看是否有审核中的
@@ -184,7 +184,7 @@ public class TProportionController {
         queryCheck.eq(TProportionCheck::getCheckType,"0");
         List<TProportionCheck> listCheck = tProportionCheckService.list(queryCheck);
         if(listCheck.size()>0){
-            R.fail("已有审核，如需修改请先取消原来的审核！");
+            return R.fail("已有审核，如需修改请先取消原来的审核！");
         }
         Long agencyId = null;
         Long merchantId = null;
@@ -197,9 +197,9 @@ public class TProportionController {
             List<TAdmin> admins = adminService.list(queryTAdmin);
             if(admins.size()>0){
                 TAdmin tAdmin = admins.get(0);
-                agencyId = tAdmin.getAreaId();
+                agencyId = tAdmin.getAgencyId();
             }else {
-                R.fail("找不到第一个分账人！");
+                return R.fail("找不到第一个分账人！");
             }
         }
         if(tProportion.getType()>1){
@@ -211,10 +211,10 @@ public class TProportionController {
                 TAdmin tAdmin = admins1.get(0);
                 merchantId = tAdmin.getAreaId();
             }else {
-                R.fail("找不到第二个分账人！");
+                return R.fail("找不到第二个分账人！");
             }
         }
-        if(tProportion.getType()>3){
+        if(tProportion.getType()>2){
             //3个
             LambdaQueryWrapper<TAdmin> queryTAdmin2 = Wrappers.lambdaQuery();
             queryTAdmin2.eq(TAdmin::getUsername,tProportion.getPersonageName());
@@ -223,7 +223,7 @@ public class TProportionController {
                 TAdmin tAdmin = admins2.get(0);
                 personageId = tAdmin.getAreaId();
             }else {
-                R.fail("找不到第三个分账人！");
+                return R.fail("找不到第三个分账人！");
             }
 
         }

src/main/java/com/szwl/model/entity/TProduct.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 /**
  * <p>
@@ -20,6 +22,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@ToString
 @ApiModel(value="TProduct对象", description="商品价格表")
 public class TProduct implements Serializable {
 

src/main/java/com/szwl/model/page/TProductPageable.java

@@ -0,0 +1,42 @@
+package com.szwl.model.page;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.szwl.model.entity.TProduct;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 商品价格表
+ * </p>
+ *
+ * @author wuhs
+ * @since 2022-04-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@ToString
+@Getter
+@Setter
+@Accessors(chain = true)
+public class TProductPageable  {
+
+
+    private List<TProduct> records;
+    private long total;
+    private long size;
+    private long current;
+    private long pages;
+
+
+}

src/main/java/com/szwl/model/param/mchParam.java

@@ -0,0 +1,29 @@
+package com.szwl.model.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Accessors(chain = true)
+@ApiModel(description = "")
+@Data
+public class mchParam {
+    private Long id;
+    @ApiModelProperty(value = ";")
+    private String cardPositive;
+    @ApiModelProperty(value = ";")
+    private String cardNegative;
+    @ApiModelProperty(value = ";")
+    private String tradeLicence;
+    @ApiModelProperty(value = ";")
+    private String openAccountLicence;
+    @ApiModelProperty(value = ";")
+    private String type;
+    @ApiModelProperty(value = ";")
+    private String status;
+}

src/main/java/com/szwl/model/query/TEquipmentParam.java

@@ -34,6 +34,8 @@ public class TEquipmentParam extends TEquipment {
     private Integer limit;
     @ApiModelProperty(value = "分页，从第几条开始，默认从0开始")
     private Integer offset;
+	private Integer current;
+	private Integer size;
     @ApiModelProperty(value = "主键id 集合，用于批量删除和批量修改")
     private List primaryKeyList;
     private List<TEquipment> entityList;//实体集合，用于批量新增

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -154,7 +154,7 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
                 }
 
                 if (data.has("alt_mch_no")){
-                    mch.setAltMchName(data.getString("alt_mch_no"));
+                    mch.setAltMchNo(data.getString("alt_mch_no"));
                 }
 
                 if(data.has("order_status")){
@@ -170,7 +170,10 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
             mch.setCreateDate(new Date());
             mch.setModifyDate(new Date());
             mch.setType("1");
-            save(mch);
+            if(StringUtils.isNotEmpty(mch.getAltMchNo())){
+                save(mch);
+            }
+
 
             if(jsonObject.has("resp_code")){
                 String resp_code = jsonObject.getString("resp_code");
@@ -186,8 +189,12 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
         } catch (IOException e) {
             e.printStackTrace();
         }
+        if(StringUtils.isNotEmpty(mch.getAltMchNo())){
+            return Constant.correct_code;
+        }else {
+            return "注册失败";
+        }
 
-        return Constant.correct_code;
     }
 
     @Override
@@ -488,6 +495,11 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
                     mch.setApproveStatus(approve_status);
                     back = approve_status;
                 }
+                String approve_note = data.getString("biz_msg");
+                mch.setApproveNote(approve_note);
+                if(StringUtils.isEmpty(back)){
+                    back = approve_note;
+                }
                 updateById(mch);
             }