ソースを参照

update gitignore

ganxiaomao 5 年 前
コミット
41612de41a
100 ファイル変更487 行追加552 行削除
  1. 39 3
      .gitignore
  2. BIN
      wjj-api/.DS_Store
  3. 13 0
      wjj-api/src/main/java/com/demo/wjj/controller/PayforController.java
  4. 233 0
      wjj-api/src/main/java/com/demo/wjj/controller/PayforPresentController.java
  5. 128 4
      wjj-api/src/main/java/com/demo/wjj/controller/PresentController.java
  6. 74 0
      wjj-api/src/main/java/com/demo/wjj/controller/SaleIntegralRecordController.java
  7. 0 57
      wjj-api/target/classes/META-INF/spring/applicationContext.xml
  8. 0 23
      wjj-api/target/classes/META-INF/spring/dispatcher.xml
  9. 0 37
      wjj-api/target/classes/META-INF/spring/mybatis-beans.xml
  10. 0 72
      wjj-api/target/classes/application.properties
  11. BIN
      wjj-api/target/classes/com/demo/wjj/controller/AgentController.class
  12. BIN
      wjj-api/target/classes/com/demo/wjj/controller/AgreementController.class
  13. BIN
      wjj-api/target/classes/com/demo/wjj/controller/AuthenticationController.class
  14. BIN
      wjj-api/target/classes/com/demo/wjj/controller/BrandController.class
  15. BIN
      wjj-api/target/classes/com/demo/wjj/controller/CertificationController.class
  16. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DemoController.class
  17. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DictionaryController.class
  18. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DiggerAgentController.class
  19. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DiggerAgentDisplaceController.class
  20. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DisplaceController.class
  21. BIN
      wjj-api/target/classes/com/demo/wjj/controller/DisplaceOfferUserController.class
  22. BIN
      wjj-api/target/classes/com/demo/wjj/controller/ImgListController.class
  23. BIN
      wjj-api/target/classes/com/demo/wjj/controller/IntegralRecordController.class
  24. BIN
      wjj-api/target/classes/com/demo/wjj/controller/ItemController.class
  25. BIN
      wjj-api/target/classes/com/demo/wjj/controller/OfferController.class
  26. BIN
      wjj-api/target/classes/com/demo/wjj/controller/OpenIdController.class
  27. BIN
      wjj-api/target/classes/com/demo/wjj/controller/PayController.class
  28. BIN
      wjj-api/target/classes/com/demo/wjj/controller/PayforController.class
  29. BIN
      wjj-api/target/classes/com/demo/wjj/controller/PayforPresentController.class
  30. BIN
      wjj-api/target/classes/com/demo/wjj/controller/PlaybillController.class
  31. BIN
      wjj-api/target/classes/com/demo/wjj/controller/PresentController.class
  32. BIN
      wjj-api/target/classes/com/demo/wjj/controller/QiNiuController.class
  33. BIN
      wjj-api/target/classes/com/demo/wjj/controller/QuoteProtocolController.class
  34. BIN
      wjj-api/target/classes/com/demo/wjj/controller/RegionController.class
  35. BIN
      wjj-api/target/classes/com/demo/wjj/controller/ResourceController.class
  36. BIN
      wjj-api/target/classes/com/demo/wjj/controller/SmsController.class
  37. BIN
      wjj-api/target/classes/com/demo/wjj/controller/TicketController.class
  38. BIN
      wjj-api/target/classes/com/demo/wjj/controller/UserController.class
  39. BIN
      wjj-api/target/classes/com/demo/wjj/controller/WeChatController.class
  40. BIN
      wjj-api/target/classes/com/demo/wjj/converter/BaseConverter.class
  41. BIN
      wjj-api/target/classes/com/demo/wjj/converter/SaveDiggerOfferConverter.class
  42. BIN
      wjj-api/target/classes/com/demo/wjj/converter/SaveDisplaceConverter$1.class
  43. BIN
      wjj-api/target/classes/com/demo/wjj/converter/SaveDisplaceConverter.class
  44. BIN
      wjj-api/target/classes/com/demo/wjj/converter/SaveOfferUserConverter.class
  45. BIN
      wjj-api/target/classes/com/demo/wjj/converter/UserRegisterConverter.class
  46. BIN
      wjj-api/target/classes/com/demo/wjj/filter/LogFilter.class
  47. BIN
      wjj-api/target/classes/com/demo/wjj/qo/SaveDiggerOfferQo.class
  48. BIN
      wjj-api/target/classes/com/demo/wjj/qo/SaveDisplaceQo.class
  49. BIN
      wjj-api/target/classes/com/demo/wjj/qo/SaveOfferUserQo.class
  50. BIN
      wjj-api/target/classes/com/demo/wjj/qo/UserRegisterQo.class
  51. BIN
      wjj-api/target/classes/com/demo/wjj/service/ResourceService.class
  52. BIN
      wjj-api/target/classes/com/demo/wjj/service/impl/ResourceServiceImpl.class
  53. BIN
      wjj-api/target/classes/com/demo/wjj/validator/SaveDiggerOfferValidator.class
  54. BIN
      wjj-api/target/classes/com/demo/wjj/validator/SaveDisplaceQoValidator.class
  55. BIN
      wjj-api/target/classes/com/demo/wjj/validator/SaveOfferUserValidator.class
  56. BIN
      wjj-api/target/classes/com/demo/wjj/validator/UserRegisterQoValidator.class
  57. 0 9
      wjj-api/target/classes/jdbc.properties
  58. 0 25
      wjj-api/target/classes/logback.xml
  59. 0 4
      wjj-api/target/maven-archiver/pom.properties
  60. 0 46
      wjj-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  61. 0 45
      wjj-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  62. 0 19
      wjj-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
  63. 0 19
      wjj-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
  64. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/AgentControllerTest.class
  65. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/BaseTest.class
  66. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/BrandControllerTest.class
  67. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/CertificationControllerTest.class
  68. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/DemoControllerTest.class
  69. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/DictionaryControllerTest.class
  70. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/DiggerAgentDisplaceControllerTest.class
  71. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/DisplaceControllerTest.class
  72. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/DisplaceOfferUserControllerTest.class
  73. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/ImgListControllerTest.class
  74. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/OfferControllerTest.class
  75. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/OpenIdControllerTest.class
  76. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/PayControllerTest.class
  77. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/QiNiuControllerTest.class
  78. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/RegionControllerTest.class
  79. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/SmsControllerTest.class
  80. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/TicketControllerTest.class
  81. BIN
      wjj-api/target/test-classes/com/demo/wjj/controller/UserControllerTest.class
  82. BIN
      wjj-api/target/test-classes/com/demo/wjj/service/ResourceServiceTest.class
  83. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT.war
  84. 0 57
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/applicationContext.xml
  85. 0 23
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/dispatcher.xml
  86. 0 37
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/mybatis-beans.xml
  87. 0 72
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/application.properties
  88. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AgentController.class
  89. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AgreementController.class
  90. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AuthenticationController.class
  91. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/BrandController.class
  92. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/CertificationController.class
  93. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DemoController.class
  94. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DictionaryController.class
  95. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DiggerAgentController.class
  96. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DiggerAgentDisplaceController.class
  97. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DisplaceController.class
  98. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DisplaceOfferUserController.class
  99. BIN
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/ImgListController.class
  100. 0 0
      wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/IntegralRecordController.class

+ 39 - 3
.gitignore

@@ -1,4 +1,40 @@
+# Compiled class file
+*.class
 *.iml
-.idea/*
-rebel.xml
-/target/
+*.idea
+target/
+logs/
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*velocity.log*
+
+# Eclipse #
+.classpath
+.project
+.settings/
+
+
+.DS_Store
+
+_dockerCerts/
+
+transaction-logs/

BIN
wjj-api/.DS_Store


+ 13 - 0
wjj-api/src/main/java/com/demo/wjj/controller/PayforController.java

@@ -3,6 +3,7 @@ package com.demo.wjj.controller;
 import com.demo.wjj.bo.CreateOrderBo;
 import com.demo.wjj.bo.CreateOrderResult;
 import com.demo.wjj.po.DiggerAgent;
+import com.demo.wjj.po.Sale;
 import com.demo.wjj.service.*;
 import com.demo.wjj.utils.ApiResult;
 import com.demo.wjj.utils.ExecuteResult;
@@ -40,6 +41,9 @@ public class PayforController {
     @Autowired
     private DiggerAgentService diggerAgentService;
 
+    @Autowired
+    private SaleService saleService;//icegan--新增
+
     /**
      * 创建微信支付订单
      *
@@ -116,6 +120,15 @@ public class PayforController {
                 ApiResult<CreateOrderResult> apiResult = ApiResult.createSuccess(executeResult.getData());
                 LOG.info("调用创建保证金微信支付订单(/pay/createOrder)接口成功, apiResult:{}", apiResult);
 
+                //icegan--销售员会员等级修改为金尊会员
+                Sale sale = saleService.getSale(agentId, openId);
+                if(sale != null){
+                    if(sale.getMemberLevel()<2){
+                        LOG.info("更新销售员agentId="+agentId+",openId="+openId+"等级,为金尊会员", apiResult);
+                        saleService.updateMemberLevel(agentId,mobile,2);
+                    }
+                }
+
                 return apiResult;
             } else {
                 Result result = executeResult.getResult();

+ 233 - 0
wjj-api/src/main/java/com/demo/wjj/controller/PayforPresentController.java

@@ -5,6 +5,7 @@ import com.demo.wjj.bo.CreateOrderResult;
 import com.demo.wjj.po.DiggerAgent;
 import com.demo.wjj.po.DiggerAgentAddress;
 import com.demo.wjj.po.IntegralRecord;
+import com.demo.wjj.po.Sale;
 import com.demo.wjj.service.*;
 import com.demo.wjj.utils.ApiResult;
 import com.demo.wjj.utils.ExecuteResult;
@@ -52,6 +53,8 @@ public class PayforPresentController {
     private PresentService presentService;
     @Autowired
     private AgentService agentService;
+    @Autowired
+    private SaleService saleService;
 
     /**
      * 创建礼品支付订单
@@ -312,4 +315,234 @@ public class PayforPresentController {
     }
 
 
+    /**
+     * 创建销售员礼品支付订单
+     *
+     * @param productId   产品id
+     * @param agentId     商家id
+     * @param openId      openId
+     * @param name        联系人姓名
+     * @param mobile      联系人手机
+     * @param tp          是否通票
+     * @param integral    兑换礼品所需积分
+     * @param code        兑换礼品所需金钱
+     * @param presentName 礼品名称
+     * @param address     车商收货人地址
+     * @param province    省
+     * @param city        市
+     * @return
+     */
+    @PostMapping("/createSaleOrder")
+    public ApiResult createSaleOrder(@RequestParam(required = false) String productId,
+                                 @RequestParam(required = false) String agentId,
+                                 @RequestParam(required = false) String openId,
+                                 @RequestParam(required = false) String name,
+                                 @RequestParam(required = false) String mobile,
+                                 @RequestParam(required = false) String tp,
+                                 @RequestParam(required = false) String integral,
+                                 @RequestParam(required = false) String code,
+                                 @RequestParam(required = false) String presentName,
+                                 @RequestParam(required = false) String address,
+                                 @RequestParam(required = false) String province,
+                                 @RequestParam(required = false) String city,
+                                 @RequestParam(required = false) String district,
+                                 HttpServletRequest request) {
+
+        LOG.info("调用创建礼品微信支付订单(/pay/createOrder)接口, productId:{}, agentId:{}, openId:{}", productId, agentId, openId);
+
+        if (StringUtils.isBlank(productId)) {
+            LOG.info("productId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("openId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(name)) {
+            LOG.info("name为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(mobile)) {
+            LOG.info("mobile为空");
+            return ApiResult.createFailure();
+        }
+        if (StringUtils.isBlank(integral)) {
+            LOG.info("integral为空");
+            return ApiResult.createFailure();
+        }
+        if (StringUtils.isBlank(code)) {
+            LOG.info("code为空");
+            return ApiResult.createFailure();
+        }
+
+        /* 手机端用户不能设置通票 wangqing 201811302208
+        if (StringUtils.isBlank(tp)) {
+            tp = "0";
+        }
+
+
+        final String[] tps = {"1", "0"};
+        if (!ArrayUtils.contains(tps, tp)) {
+            LOG.info("tp值非法, tp:{}", tp);
+            return ApiResult.createFailure();
+        }*/
+        Integer codeNew = Integer.parseInt(code);
+        String addressNew = province + city + district + address;
+
+        if (codeNew == 0) {
+            //DiggerAgent diggerAgent = diggerAgentService.getDiggerAgent(agentId, openId);
+            Sale sale = saleService.getSale(agentId, openId);
+            Integer integralOld = sale.getIntegral();//diggerAgentService.getOne(diggerAgent.getDaId()).getIntegral();
+            String userId = sale.getSaleId();//.getdiggerAgent.getDaId();
+            Integer integralAnd = Integer.parseInt(integral);
+            Integer integralNew = integralOld - integralAnd;
+            //更新车商积分
+            //diggerAgentService.updateIntegral(userId, integralNew);
+            saleService.addIntegral(openId, -integralAnd);
+            IntegralRecord integralRecord = new IntegralRecord();
+            integralRecord.setPresentName(presentName);
+            integralRecord.setUserName(sale.getSaleName());
+            integralRecord.setMemberLevel(sale.getMemberLevel());
+            integralRecord.setPhone(mobile);
+            integralRecord.setAddress(addressNew);
+            Date date = new Date();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String time = sdf.format(date);
+            integralRecord.setExchangeTime(time);
+            integralRecord.setUserId(userId);
+            integralRecord.setIntegral(integralAnd);
+            integralRecord.setPrice(codeNew);
+            integralRecord.setAddId(agentId);
+            integralRecord.setAgentName(agentService.selectInteg(agentId).getAgentName());
+            integralRecord.setImageUrl(presentService.selectPresent(Integer.parseInt(productId)).getImageUrl());
+            integralRecord.setPresentId(Integer.parseInt(productId));
+            integralRecordService.save(integralRecord);
+            Integer presentId = Integer.parseInt(productId);
+            int storeNew;
+            Integer store = (presentService.selectPresent(presentId).getStore()) - 1;
+            if (store > 0) {
+                storeNew = store;
+            } else {
+                storeNew = 0;
+            }
+            presentService.updateStore(presentId, storeNew);
+            Map map = new HashMap();
+            map.put("status", "0");
+            return ApiResult.createSuccess(map);
+
+
+        }
+        //DiggerAgent diggerAgent = diggerAgentService.getDiggerAgent(agentId, openId);
+        Sale sale = saleService.getSale(agentId, openId);
+        String diggerAgentId = sale.getSaleId();//diggerAgent.getDaId();
+        List userList = new ArrayList();
+        List<DiggerAgentAddress> list = diggerAgentAddressService.select();
+        if (list != null) {
+            for (int i = 0; i < list.size(); i++) {
+                userList.add(list.get(i).getUserId());
+
+            }
+        }
+        if (userList != null) {
+            if (userList.contains(diggerAgentId)) {
+                diggerAgentAddressService.delete(diggerAgentId);
+            }
+
+
+        }
+        DiggerAgentAddress diggerAgentAddress = new DiggerAgentAddress();
+        diggerAgentAddress.setAddress(addressNew);
+        diggerAgentAddress.setUserId(diggerAgentId);
+        diggerAgentAddress.setUserName(sale.getSaleName());
+        diggerAgentAddress.setPhone(mobile);
+        diggerAgentAddressService.save(diggerAgentAddress);
+
+
+        CreateOrderBo createOrderBo = new CreateOrderBo();
+        createOrderBo.setProductId(productId);
+        createOrderBo.setAgentId(agentId);
+        createOrderBo.setOpenId(openId);
+        createOrderBo.setName(name);
+        createOrderBo.setMobile(mobile);
+        /* 手机端用户不能设置通票 wangqing 201811302208
+        createOrderBo.setTp(Integer.parseInt(tp));
+        */
+        createOrderBo.setClientIp(IpUtils.getIp(request));
+        try {
+            ExecuteResult<CreateOrderResult> executeResult = payforPrensentService.createOrder(createOrderBo, code);
+            if (executeResult.isExecuteResult()) {
+                ApiResult<CreateOrderResult> apiResult = ApiResult.createSuccess(executeResult.getData());
+                LOG.info("调用创建保证金微信支付订单(/pay/createOrder)接口成功, apiResult:{}", apiResult);
+
+                return apiResult;
+            } else {
+                Result result = executeResult.getResult();
+                if (result == null) {
+                    result = Result.Failure;
+                }
+                return new ApiResult(result);
+            }
+
+        } catch (Exception e) {
+            LOG.error("调用创建保证金微信支付订单(/pay/createOrder)接口异常", e);
+            return ApiResult.createFailure();
+        }
+
+    }
+
+
+    /**
+     * 调用销售员修改礼品兑换表
+     * @param agentId
+     * @param openId
+     * @param name
+     * @param mobile
+     * @param integral
+     * @param code
+     * @param presentName
+     * @param address
+     * @return
+     */
+    @PostMapping("/updateSale")
+    public ApiResult updateSale(@RequestParam(required = false) String agentId,
+                            @RequestParam(required = false) String openId,
+                            @RequestParam(required = false) String name,
+                            @RequestParam(required = false) String mobile,
+                            @RequestParam(required = false) String integral,
+                            @RequestParam(required = false) String code,
+                            @RequestParam(required = false) String presentName,
+                            @RequestParam(required = false) String address) {
+        LOG.info("调用修改礼品兑换表接口/payfor/update");
+        //DiggerAgent diggerAgent = diggerAgentService.getDiggerAgent(agentId, openId);
+        Sale sale = saleService.getSale(agentId, openId);
+        String userId = sale.getSaleId();//diggerAgent.getDaId();
+        Integer integralNew = Integer.parseInt(integral);
+        Integer codeNew = Integer.parseInt(code);
+        //diggerAgentService.updateIntegral(userId, 0);
+        saleService.addIntegral(openId, -sale.getIntegral());
+        IntegralRecord integralRecord = new IntegralRecord();
+        integralRecord.setPresentName(presentName);
+        integralRecord.setUserName(name);
+        integralRecord.setMemberLevel(sale.getMemberLevel());
+        integralRecord.setPhone(mobile);
+        integralRecord.setAddress(address);
+        Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String time = sdf.format(date);
+        integralRecord.setExchangeTime(time);
+        integralRecord.setUserId(userId);
+        integralRecord.setIntegral(integralNew);
+        integralRecord.setPrice(codeNew);
+        integralRecordService.save(integralRecord);
+
+        return ApiResult.createSuccess("修改表格成功");
+    }
 }

+ 128 - 4
wjj-api/src/main/java/com/demo/wjj/controller/PresentController.java

@@ -3,10 +3,8 @@ package com.demo.wjj.controller;
 import com.demo.wjj.po.IntegralRecord;
 import com.demo.wjj.po.PresentAndMoney;
 import com.demo.wjj.po.Present;
-import com.demo.wjj.service.DiggerAgentService;
-import com.demo.wjj.service.IntegralRecordService;
-import com.demo.wjj.service.PresentService;
-import com.demo.wjj.service.QiNiuService;
+import com.demo.wjj.po.Sale;
+import com.demo.wjj.service.*;
 import com.demo.wjj.utils.ApiResult;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -31,6 +29,8 @@ public class PresentController {
     IntegralRecordService integralRecordService;
     @Autowired
     QiNiuService qiNiuService;
+    @Autowired
+    private SaleService saleService;
 
     /**
      * 获取礼品所有信息
@@ -187,4 +187,128 @@ public class PresentController {
         }
     }
 
+    /**
+     * 获取销售员礼品接口
+     * @param id
+     * @param integral
+     * @param agentId
+     * @param openId
+     * @return
+     */
+    @GetMapping("/getSalePresent")
+    public ApiResult getSalePresent(@RequestParam(required = false) String id,
+                                @RequestParam(required = false) String integral,
+                                @RequestParam(required = false) String agentId,
+                                @RequestParam(required = false) String openId){
+        LOG.info("调用获取礼品表信息(/pre/getPresent)接口,id:{},integral",id,integral);
+        try{
+            Map map = new HashMap();
+            Sale sale = saleService.getSale(agentId, openId);
+            String daId = sale.getSaleId();
+
+            Integer pid = Integer.parseInt(id);
+            Present present = presentService.selectPresent(pid);
+            Integer amount = present.getAmount();
+            int counts = integralRecordService.selectCounts(daId, id);
+            if(counts>=amount){
+                map.put("status","0");
+                return ApiResult.createSuccess(map);
+            }
+            String str = present.getImageUrl();
+            List list1 = Arrays.asList(str.split("#"));
+            List arrList = new ArrayList(list1);
+            arrList.remove(0);
+            List imageList = new ArrayList();
+            for (int j = 0; j < arrList.size(); j++) {
+                String url = qiNiuService.getUrl(arrList.get(j).toString());
+                imageList.add(url);
+            }
+            String imageUrl = "";
+            for (int o = 0; o < imageList.size(); o++) {
+                imageUrl += "##" + imageList.get(o);
+            }
+            present.setImageUrl(imageUrl);
+
+            Integer integralNeed = present.getIntegral();
+            Integer IntegerHave = Integer.parseInt(integral);
+            Integer money;
+
+
+            if(IntegerHave-integralNeed>=0){
+                money =0;
+            }else {
+                double moneyOld =(double) (integralNeed-IntegerHave)/Integer.parseInt(present.getProportion());
+                if(moneyOld<1){
+                    money =1;
+                }else {
+                    money = (integralNeed-IntegerHave)/Integer.parseInt(present.getProportion());
+                }
+
+            }
+            PresentAndMoney presentAndMoney = new PresentAndMoney();
+            presentAndMoney.setMoney(money);
+            presentAndMoney.setPresent(present);
+
+
+
+            LOG.info("调用获取礼品表所有信息(/pre/getPresent)接口成功");
+            return ApiResult.createSuccess(presentAndMoney);
+
+        }catch (Exception e){
+            LOG.error("调用获取礼品表所有信息(/pre/getPresent)接口异常",e);
+            return ApiResult.createFailure();
+
+        }
+
+    }
+
+    /**
+     * 获取销售员礼品详情接口
+     * @param id
+     * @param userId
+     * @return
+     */
+    @GetMapping("/commoditySaleDetails")
+    public ApiResult commoditySaleDetails(@RequestParam(required = false) String id,
+                                         @RequestParam(required = false) String userId){
+        LOG.info("调用礼品详情(/pre/commodityDetails)接口,id:{},userId:{}",id,userId);
+        if(StringUtils.isBlank(id)){
+            LOG.info("id为空");
+            return ApiResult.createFailure();
+        }
+        if (StringUtils.isBlank(userId)){
+            LOG.info("userId为空");
+            return ApiResult.createFailure();
+        }
+        try {
+            Map map = new HashMap();
+            Sale sale = saleService.getSale(userId);
+            Integer integralAll = sale.getIntegral();//diggerAgentService.getOne(userId).getIntegral();
+            Integer pid = Integer.parseInt(id);
+            Present present = presentService.selectPresent(pid);
+            map.put("present",present);
+            map.put("integralAll",integralAll);
+            Integer integralNeed = present.getIntegral();
+            String proportion = present.getProportion();
+            Integer spread = integralAll - integralNeed;
+            if(spread<0){
+                Integer integralSpread = -spread;
+                Integer number = Integer.parseInt(proportion.split(":")[1]);
+                int cash = integralSpread/number;
+                map.put("cash",cash);
+                LOG.info("调用礼品详情(/pre/commodityDetails)接口成功");
+                return ApiResult.createSuccess(map);
+            }else {
+
+                map.put("cash",0);
+                LOG.info("调用礼品详情(/pre/commodityDetails)接口成功");
+                return ApiResult.createSuccess(map);
+            }
+
+        }catch (Exception e){
+            LOG.info("调用礼品详情(/pre/commodityDetails)接口异常",e);
+            return ApiResult.createFailure();
+
+        }
+    }
 }

+ 74 - 0
wjj-api/src/main/java/com/demo/wjj/controller/SaleIntegralRecordController.java

@@ -0,0 +1,74 @@
+package com.demo.wjj.controller;
+
+import com.demo.wjj.po.IntegralRecord;
+import com.demo.wjj.service.*;
+import com.demo.wjj.utils.ApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * icegan--销售员积分兑换记录
+ */
+@RestController
+@RequestMapping("/saleIntegralRecord")
+public class SaleIntegralRecordController {
+    private final Logger LOG = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private IntegralRecordService integralRecordService;
+    @Autowired
+    private DiggerAgentService diggerAgentService;
+    @Autowired
+    private DiggerAgentAddressService diggerAgentAddressService;
+    @Autowired
+    private QiNiuService qiNiuService;
+    @Autowired
+    private SaleService saleService;
+
+    /**
+     * 获取兑换记录列表
+     * @param agentId
+     * @param openId
+     * @return
+     */
+    @GetMapping("/getIntegralRecord")
+    public ApiResult getIntegralRecord(@RequestParam(required = false)String agentId,
+                                       @RequestParam(required = false)String openId){
+        LOG.info("调用销售员获取兑换记录列表(/integralRecord/getIntegralRecord)接口, agentId:{}, openId:{}", agentId, openId);
+        try {
+            String daId = saleService.getSale(agentId, openId).getSaleId();
+            List<IntegralRecord> integralRecords = integralRecordService.select(daId);
+            if(integralRecords!=null){
+                for (int i = 0; i < integralRecords.size(); i++) {
+                    IntegralRecord integralRecord = integralRecords.get(i);
+                    List<String> list = Arrays.asList(integralRecord.getImageUrl().split("#"));
+                    String imageUrl = qiNiuService.getUrl(list.get(1));
+                    integralRecords.get(i).setImageUrl(imageUrl);
+
+                }
+            }
+
+            ApiResult<List<IntegralRecord>> apiResult = ApiResult.createSuccess(integralRecords);
+            LOG.info("调用销售员获取兑换记录列表(/integralRecord/getIntegralRecord)接口成功");
+            LOG.debug("获取销售员品牌(/integralRecord/getIntegralRecord), apiResult:{}", apiResult);
+            return apiResult;
+        }catch (Exception e){
+            LOG.error("调用销售员获取兑换记录列表(/integralRecord/getIntegralRecord)接口异常", e);
+            return ApiResult.createFailure();
+        }
+
+
+    }
+    @GetMapping("/delete")
+    public ApiResult delete(String userId){
+        boolean result = diggerAgentAddressService.delete(userId);
+        return ApiResult.createSuccess(result);
+    }
+}

+ 0 - 57
wjj-api/target/classes/META-INF/spring/applicationContext.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:c="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:task="http://www.springframework.org/schema/task"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd">
-
-
-    <!--扫描组件-->
-    <c:component-scan base-package="com.demo.wjj.service"/>
-
-    <!--配置文件-->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <list>
-                <value>classpath:application.properties</value>
-                <value>classpath:jdbc.properties</value>
-            </list>
-        </property>
-    </bean>
-
-    <!--数据源-->
-    <bean id="datasource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${jdbc.driverName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.username}"/>
-        <property name="password" value="${jdbc.password}"/>
-    </bean>
-
-    <!--事务管理-->
-    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="datasource"/>
-    </bean>
-
-    <tx:annotation-driven/>
-
-    <import resource="mybatis-beans.xml"/>
-
-    <!--短信发送服务-->
-    <bean id="smsSendService" class="com.demo.wjj.service.impl.SmsSendServiceImpl">
-        <property name="url" value="${sms.url}"/>
-        <property name="name" value="${sms.username}"/>
-        <property name="pwd" value="${sms.password}"/>
-        <property name="sign" value="${sms.code.sign}"/>
-    </bean>
-
-    <bean class="com.demo.wjj.service.impl.ValidateCodeServiceImpl">
-        <property name="smsSendService" ref="smsSendService"/>
-        <property name="template" value="${sms.code.template}"/>
-    </bean>
-
-    <!-- 定时任务 -->
-    <task:annotation-driven scheduler="qbScheduler" mode="proxy"/>
-    <task:scheduler id="qbScheduler" />
-
-</beans>

+ 0 - 23
wjj-api/target/classes/META-INF/spring/dispatcher.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <!--扫描组件-->
-    <context:component-scan base-package="com.demo.wjj.controller"/>
-    <context:component-scan base-package="com.demo.wjj.validator"/>
-    <context:component-scan base-package="com.demo.wjj.converter"/>
-
-    <mvc:annotation-driven>
-        <mvc:message-converters>
-            <bean class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-                <property name="supportedMediaTypes" value="application/json;charset=utf-8"/>
-            </bean>
-        </mvc:message-converters>
-    </mvc:annotation-driven>
-
-    <mvc:default-servlet-handler/>
-
-</beans>

+ 0 - 37
wjj-api/target/classes/META-INF/spring/mybatis-beans.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="datasource" />
-        <property name="mapperLocations" value="classpath*:mybatis/*.xml" />
-        <property name="configurationProperties">
-            <props>
-                <prop key="cacheEnabled">false</prop>
-            </props>
-        </property>
-        <property name="plugins">
-            <array>
-                <bean class="com.github.pagehelper.PageInterceptor">
-                    <property name="properties">
-                        <value>helperDialect=mysql</value>
-                    </property>
-                </bean>
-            </array>
-        </property>
-    </bean>
-
-    <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-        <constructor-arg index="0" ref="sqlSessionFactory" />
-    </bean>
-
-    <mvc:cors>
-        <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800"
-                     allowed-methods="GET,POST,PUT,DELETE,PATCH,OPTIONS"/>
-    </mvc:cors>
-
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="com.demo.wjj.mapper" />
-    </bean>
-</beans>

+ 0 - 72
wjj-api/target/classes/application.properties

@@ -1,72 +0,0 @@
-sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-sms.username=\u5fae\u5de5\u7a0b
-sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-sms.code.sign=\u65b0\u673a\u7f18
-
-weixin.pay.domain=https://www.weigongcheng.net/wjj-api
-weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-
-qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-qiniu.bucket=weigongcheng
-qiniu.bucket.domain=http://tp.weigongcheng.net
-qiniu.expire=3600
-
-#置换审核域名
-displaceAuditHost=https://www.weigongcheng.net/agentPlat
-#等待审核通知
-displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-
-#平台可见agentId
-platformAgentId=WGC000
-
-platform.appId=wx6af4ca6c083a5918
-platform.appSecret=515bb52094b522fd958bee043b42a9ec
-platform.token=BensF7xcrZBFnHOnSuAL
-platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-#微信小程序所属公众号appId
-weixin.appId=wx0cb0cbc34027621f
-#第三方授权模板id
-weixin.templateId=2
-
-
-
-#sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-#sms.username=\u5fae\u5de5\u7a0b
-#sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-#sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-#sms.code.sign=\u65b0\u673a\u7f18
-#
-#weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
-#weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-#
-#qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-#qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-#qiniu.bucket=weigongcheng
-#qiniu.bucket.domain=http://tp.weigongcheng.net
-#qiniu.expire=3600
-#
-##置换审核域名
-#displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
-##等待审核通知
-#displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-#
-##平台可见agentId
-#platformAgentId=XJY00
-#
-#platform.appId=wx94660c86d38f6bc3
-#platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
-#platform.token=BensF7xcrZBFnHOnSuAN
-#platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-#
-##微信小程序所属公众号appId
-#weixin.appId=wx0cb0cbc34027621f
-#
-##第三方授权模板id
-#weixin.templateId=2
-
-
-
-
-

BIN
wjj-api/target/classes/com/demo/wjj/controller/AgentController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/AgreementController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/AuthenticationController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/BrandController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/CertificationController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DemoController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DictionaryController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DiggerAgentController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DiggerAgentDisplaceController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DisplaceController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/DisplaceOfferUserController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/ImgListController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/IntegralRecordController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/ItemController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/OfferController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/OpenIdController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/PayController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/PayforController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/PayforPresentController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/PlaybillController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/PresentController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/QiNiuController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/QuoteProtocolController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/RegionController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/ResourceController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/SmsController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/TicketController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/UserController.class


BIN
wjj-api/target/classes/com/demo/wjj/controller/WeChatController.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/BaseConverter.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/SaveDiggerOfferConverter.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/SaveDisplaceConverter$1.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/SaveDisplaceConverter.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/SaveOfferUserConverter.class


BIN
wjj-api/target/classes/com/demo/wjj/converter/UserRegisterConverter.class


BIN
wjj-api/target/classes/com/demo/wjj/filter/LogFilter.class


BIN
wjj-api/target/classes/com/demo/wjj/qo/SaveDiggerOfferQo.class


BIN
wjj-api/target/classes/com/demo/wjj/qo/SaveDisplaceQo.class


BIN
wjj-api/target/classes/com/demo/wjj/qo/SaveOfferUserQo.class


BIN
wjj-api/target/classes/com/demo/wjj/qo/UserRegisterQo.class


BIN
wjj-api/target/classes/com/demo/wjj/service/ResourceService.class


BIN
wjj-api/target/classes/com/demo/wjj/service/impl/ResourceServiceImpl.class


BIN
wjj-api/target/classes/com/demo/wjj/validator/SaveDiggerOfferValidator.class


BIN
wjj-api/target/classes/com/demo/wjj/validator/SaveDisplaceQoValidator.class


BIN
wjj-api/target/classes/com/demo/wjj/validator/SaveOfferUserValidator.class


BIN
wjj-api/target/classes/com/demo/wjj/validator/UserRegisterQoValidator.class


+ 0 - 9
wjj-api/target/classes/jdbc.properties

@@ -1,9 +0,0 @@
-jdbc.driverName=com.mysql.jdbc.Driver
-#外网
-jdbc.url=jdbc:mysql://47.99.39.89:3306/agent?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
-jdbc.username=root
-jdbc.password=AgentWgc
-#生产
-#jdbc.url=jdbc:mysql://47.99.39.89:3306/agent_xinjiyuan?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
-#jdbc.username=root
-#jdbc.password=AgentWgc

+ 0 - 25
wjj-api/target/classes/logback.xml

@@ -1,25 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level uk:%X{uk} %logger{35} - %msg %n</pattern>
-        </encoder>
-    </appender>
-
-
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/root/logs/wjj-api.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>50</maxHistory>
-                 </rollingPolicy>
-             
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level uk:%X{uk} %logger{35} - %msg %n</pattern>
-                 </encoder>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="FILE" />
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>

+ 0 - 4
wjj-api/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.6.1
-version=1.0-SNAPSHOT
-groupId=com.demo
-artifactId=wjj-api

+ 0 - 46
wjj-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,46 +0,0 @@
-com\demo\wjj\controller\DiggerAgentDisplaceController.class
-com\demo\wjj\controller\PayController.class
-com\demo\wjj\filter\LogFilter.class
-com\demo\wjj\service\impl\ResourceServiceImpl.class
-com\demo\wjj\controller\AuthenticationController.class
-com\demo\wjj\controller\ResourceController.class
-com\demo\wjj\controller\DiggerAgentController.class
-com\demo\wjj\controller\BrandController.class
-com\demo\wjj\controller\DemoController.class
-com\demo\wjj\converter\UserRegisterConverter.class
-com\demo\wjj\controller\ItemController.class
-com\demo\wjj\controller\RegionController.class
-com\demo\wjj\controller\DisplaceOfferUserController.class
-com\demo\wjj\controller\OpenIdController.class
-com\demo\wjj\controller\SmsController.class
-com\demo\wjj\controller\UserController.class
-com\demo\wjj\validator\UserRegisterQoValidator.class
-com\demo\wjj\controller\PresentController.class
-com\demo\wjj\service\ResourceService.class
-com\demo\wjj\qo\SaveOfferUserQo.class
-com\demo\wjj\controller\QiNiuController.class
-com\demo\wjj\validator\SaveOfferUserValidator.class
-com\demo\wjj\controller\AgreementController.class
-com\demo\wjj\controller\CertificationController.class
-com\demo\wjj\controller\WeChatController.class
-com\demo\wjj\qo\UserRegisterQo.class
-com\demo\wjj\controller\AgentController.class
-com\demo\wjj\controller\ImgListController.class
-com\demo\wjj\converter\SaveDiggerOfferConverter.class
-com\demo\wjj\controller\IntegralRecordController.class
-com\demo\wjj\controller\OfferController.class
-com\demo\wjj\converter\BaseConverter.class
-com\demo\wjj\controller\DisplaceController.class
-com\demo\wjj\controller\PayforController.class
-com\demo\wjj\qo\SaveDiggerOfferQo.class
-com\demo\wjj\validator\SaveDisplaceQoValidator.class
-com\demo\wjj\controller\DictionaryController.class
-com\demo\wjj\qo\SaveDisplaceQo.class
-com\demo\wjj\converter\SaveDisplaceConverter.class
-com\demo\wjj\validator\SaveDiggerOfferValidator.class
-com\demo\wjj\controller\TicketController.class
-com\demo\wjj\converter\SaveDisplaceConverter$1.class
-com\demo\wjj\controller\PlaybillController.class
-com\demo\wjj\controller\PayforPresentController.class
-com\demo\wjj\controller\QuoteProtocolController.class
-com\demo\wjj\converter\SaveOfferUserConverter.class

+ 0 - 45
wjj-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,45 +0,0 @@
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DemoController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\qo\SaveDisplaceQo.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\IntegralRecordController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\filter\LogFilter.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\qo\SaveOfferUserQo.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\validator\SaveDisplaceQoValidator.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\PresentController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\validator\SaveDiggerOfferValidator.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\CertificationController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\service\ResourceService.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\OfferController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\PayController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\service\impl\ResourceServiceImpl.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DiggerAgentDisplaceController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\ImgListController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\converter\SaveOfferUserConverter.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\AgreementController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\BrandController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\AuthenticationController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\converter\SaveDiggerOfferConverter.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DisplaceController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\validator\SaveOfferUserValidator.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\SmsController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\TicketController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\AgentController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DictionaryController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\qo\UserRegisterQo.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DiggerAgentController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\ItemController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\QiNiuController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\validator\UserRegisterQoValidator.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\UserController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\WeChatController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\OpenIdController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\PayforController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\ResourceController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\QuoteProtocolController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\converter\UserRegisterConverter.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\DisplaceOfferUserController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\qo\SaveDiggerOfferQo.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\PlaybillController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\RegionController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\converter\SaveDisplaceConverter.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\controller\PayforPresentController.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\main\java\com\demo\wjj\converter\BaseConverter.java

+ 0 - 19
wjj-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,19 +0,0 @@
-com\demo\wjj\controller\QiNiuControllerTest.class
-com\demo\wjj\controller\DemoControllerTest.class
-com\demo\wjj\controller\TicketControllerTest.class
-com\demo\wjj\controller\BaseTest.class
-com\demo\wjj\controller\DisplaceControllerTest.class
-com\demo\wjj\controller\PayControllerTest.class
-com\demo\wjj\controller\UserControllerTest.class
-com\demo\wjj\controller\OfferControllerTest.class
-com\demo\wjj\controller\AgentControllerTest.class
-com\demo\wjj\controller\DiggerAgentDisplaceControllerTest.class
-com\demo\wjj\controller\DisplaceOfferUserControllerTest.class
-com\demo\wjj\controller\RegionControllerTest.class
-com\demo\wjj\controller\DictionaryControllerTest.class
-com\demo\wjj\controller\SmsControllerTest.class
-com\demo\wjj\controller\BrandControllerTest.class
-com\demo\wjj\controller\CertificationControllerTest.class
-com\demo\wjj\controller\OpenIdControllerTest.class
-com\demo\wjj\controller\ImgListControllerTest.class
-com\demo\wjj\service\ResourceServiceTest.class

+ 0 - 19
wjj-api/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,19 +0,0 @@
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\TicketControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\BaseTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\ImgListControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\DisplaceControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\UserControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\OfferControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\DiggerAgentDisplaceControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\SmsControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\BrandControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\DisplaceOfferUserControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\PayControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\QiNiuControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\CertificationControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\DemoControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\RegionControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\AgentControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\DictionaryControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\controller\OpenIdControllerTest.java
-C:\Users\icega\Documents\workspace\codes\xinjiyuan\wechatback\wjj-api\src\test\java\com\demo\wjj\service\ResourceServiceTest.java

BIN
wjj-api/target/test-classes/com/demo/wjj/controller/AgentControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/BaseTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/BrandControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/CertificationControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/DemoControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/DictionaryControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/DiggerAgentDisplaceControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/DisplaceControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/DisplaceOfferUserControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/ImgListControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/OfferControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/OpenIdControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/PayControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/QiNiuControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/RegionControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/SmsControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/TicketControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/controller/UserControllerTest.class


BIN
wjj-api/target/test-classes/com/demo/wjj/service/ResourceServiceTest.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT.war


+ 0 - 57
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/applicationContext.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:c="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:task="http://www.springframework.org/schema/task"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd">
-
-
-    <!--扫描组件-->
-    <c:component-scan base-package="com.demo.wjj.service"/>
-
-    <!--配置文件-->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <list>
-                <value>classpath:application.properties</value>
-                <value>classpath:jdbc.properties</value>
-            </list>
-        </property>
-    </bean>
-
-    <!--数据源-->
-    <bean id="datasource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${jdbc.driverName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.username}"/>
-        <property name="password" value="${jdbc.password}"/>
-    </bean>
-
-    <!--事务管理-->
-    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="datasource"/>
-    </bean>
-
-    <tx:annotation-driven/>
-
-    <import resource="mybatis-beans.xml"/>
-
-    <!--短信发送服务-->
-    <bean id="smsSendService" class="com.demo.wjj.service.impl.SmsSendServiceImpl">
-        <property name="url" value="${sms.url}"/>
-        <property name="name" value="${sms.username}"/>
-        <property name="pwd" value="${sms.password}"/>
-        <property name="sign" value="${sms.code.sign}"/>
-    </bean>
-
-    <bean class="com.demo.wjj.service.impl.ValidateCodeServiceImpl">
-        <property name="smsSendService" ref="smsSendService"/>
-        <property name="template" value="${sms.code.template}"/>
-    </bean>
-
-    <!-- 定时任务 -->
-    <task:annotation-driven scheduler="qbScheduler" mode="proxy"/>
-    <task:scheduler id="qbScheduler" />
-
-</beans>

+ 0 - 23
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/dispatcher.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <!--扫描组件-->
-    <context:component-scan base-package="com.demo.wjj.controller"/>
-    <context:component-scan base-package="com.demo.wjj.validator"/>
-    <context:component-scan base-package="com.demo.wjj.converter"/>
-
-    <mvc:annotation-driven>
-        <mvc:message-converters>
-            <bean class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-                <property name="supportedMediaTypes" value="application/json;charset=utf-8"/>
-            </bean>
-        </mvc:message-converters>
-    </mvc:annotation-driven>
-
-    <mvc:default-servlet-handler/>
-
-</beans>

+ 0 - 37
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/mybatis-beans.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="datasource" />
-        <property name="mapperLocations" value="classpath*:mybatis/*.xml" />
-        <property name="configurationProperties">
-            <props>
-                <prop key="cacheEnabled">false</prop>
-            </props>
-        </property>
-        <property name="plugins">
-            <array>
-                <bean class="com.github.pagehelper.PageInterceptor">
-                    <property name="properties">
-                        <value>helperDialect=mysql</value>
-                    </property>
-                </bean>
-            </array>
-        </property>
-    </bean>
-
-    <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-        <constructor-arg index="0" ref="sqlSessionFactory" />
-    </bean>
-
-    <mvc:cors>
-        <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800"
-                     allowed-methods="GET,POST,PUT,DELETE,PATCH,OPTIONS"/>
-    </mvc:cors>
-
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="com.demo.wjj.mapper" />
-    </bean>
-</beans>

+ 0 - 72
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/application.properties

@@ -1,72 +0,0 @@
-sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-sms.username=\u5fae\u5de5\u7a0b
-sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-sms.code.sign=\u65b0\u673a\u7f18
-
-weixin.pay.domain=https://www.weigongcheng.net/wjj-api
-weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-
-qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-qiniu.bucket=weigongcheng
-qiniu.bucket.domain=http://tp.weigongcheng.net
-qiniu.expire=3600
-
-#置换审核域名
-displaceAuditHost=https://www.weigongcheng.net/agentPlat
-#等待审核通知
-displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-
-#平台可见agentId
-platformAgentId=WGC000
-
-platform.appId=wx6af4ca6c083a5918
-platform.appSecret=515bb52094b522fd958bee043b42a9ec
-platform.token=BensF7xcrZBFnHOnSuAL
-platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-#微信小程序所属公众号appId
-weixin.appId=wx0cb0cbc34027621f
-#第三方授权模板id
-weixin.templateId=2
-
-
-
-#sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-#sms.username=\u5fae\u5de5\u7a0b
-#sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-#sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-#sms.code.sign=\u65b0\u673a\u7f18
-#
-#weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
-#weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-#
-#qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-#qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-#qiniu.bucket=weigongcheng
-#qiniu.bucket.domain=http://tp.weigongcheng.net
-#qiniu.expire=3600
-#
-##置换审核域名
-#displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
-##等待审核通知
-#displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-#
-##平台可见agentId
-#platformAgentId=XJY00
-#
-#platform.appId=wx94660c86d38f6bc3
-#platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
-#platform.token=BensF7xcrZBFnHOnSuAN
-#platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-#
-##微信小程序所属公众号appId
-#weixin.appId=wx0cb0cbc34027621f
-#
-##第三方授权模板id
-#weixin.templateId=2
-
-
-
-
-

BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AgentController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AgreementController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/AuthenticationController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/BrandController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/CertificationController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DemoController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DictionaryController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DiggerAgentController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DiggerAgentDisplaceController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DisplaceController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/DisplaceOfferUserController.class


BIN
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/ImgListController.class


+ 0 - 0
wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/com/demo/wjj/controller/IntegralRecordController.class


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません