forked from beauty-erp
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -163,7 +163,7 @@ case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE: Double zdje=Double.parseDouble(applyCondition.getParamValue2()); Double yxfje=shopOrderV2Dao.countOrderAmount(openId); if(zdje>yxfje){ if(zdje<yxfje){ verificationResult=VerificationResult.buildVerificationResult(true); }else{ verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！"); zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesProductAction.java
@@ -8,6 +8,7 @@ import com.matrix.system.shopXcx.bean.ShopProductAttribute; import com.matrix.system.shopXcx.dao.ShopProductAttributeDao; import com.matrix.system.shopXcx.dao.ShopProductDao; import com.matrix.system.shopXcx.dao.ShopSkuDao; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -36,6 +37,9 @@ @Autowired private ShopProductAttributeDao shopProductAttributeDao; @Autowired private ShopSkuDao shopSkuDao; @ApiOperation(value = "查询推广商品", notes = "") @PostMapping(value = "/getSalesProductList") @ApiResponses({ @@ -46,12 +50,13 @@ ShopProductAttribute fxsc = shopProductAttributeDao.selectByCode("fxsc", HostInterceptor.getCompanyId()); shopProduct.setLimit(saleProductDto.getPageSize()); shopProduct.setOffset(saleProductDto.getPageNum()* saleProductDto.getPageSize()); shopProduct.setOffset((saleProductDto.getPageNum()-1)* saleProductDto.getPageSize()); shopProduct.setDelFlag(AppConstance.DATA_USEABLE); shopProduct.setStatus(AppConstance.IS_PUTAWAY); shopProduct.setCompanyId(HostInterceptor.getCompanyId()); shopProduct.setAttrs(fxsc.getAttrId()+""); List<ShopProduct> shopProducts = shopProductDao.selectByModelWx(shopProduct); shopProducts.forEach(item->item.setSkus(shopSkuDao.selectByPid(item.getId()))); AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, shopProducts); return result; } zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -102,7 +102,7 @@ String invitationId = param.get("invitationId"); if(StringUtils.isNotBlank(invitationId)){ BizUser invitationUser = bizUserDao.findByOpenId(invitationId); if(invitationUser.getOpenId().equals(loginUser.getOpenId())) { if(invitationUser!=null && invitationUser.getOpenId().equals(loginUser.getOpenId())) { return AjaxResult.buildFailInstance("不能邀请自己成为推广员"); } } zq-erp/src/main/resources/config/application.properties
@@ -1,4 +1,4 @@ evn=dev evn=jyy server.port=8080
@@ -19,11 +19,11 @@ maxUploadSize=10485760 #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=123456 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=7 zq-erp/src/main/resources/config/prd/system.properties
@@ -19,11 +19,11 @@ maxUploadSize=10485760 #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=123456 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 zq-erp/src/main/resources/config/system.properties
@@ -23,11 +23,11 @@ maxUploadSize=10485760 #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=123456 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 zq-erp/src/main/resources/config/test/system.properties
@@ -20,11 +20,11 @@ #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=123456 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 zq-erp/src/main/resources/config/xcx/system.properties
@@ -20,11 +20,11 @@ #Matser\u7684ip\u5730\u5740 redis.hostname=118.31.227.147 redis.hostname=120.27.238.55 #\u7AEF\u53E3\u53F7 redis.port=6379 #\u5982\u679C\u6709\u5BC6\u7801 redis.password=123456 redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 redis.database=1 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -147,9 +147,7 @@ IFNULL(sum(IFNULL( b.amount, 0 )),0) FROM shop_salesman_order b WHERE b.user_id = a.open_id and order_status=2 WHERE order_status=2 AND b.sales_user_id = #{openId} ) AS totalRevenue, @@ -158,9 +156,7 @@ IFNULL(sum(IFNULL( b.amount, 0 )),0) FROM shop_salesman_order b WHERE b.user_id = a.open_id and order_status=2 and revenue_type=1 WHERE order_status=2 and revenue_type=1 AND b.sales_user_id = #{openId} ) AS salesRevenue, @@ -169,9 +165,7 @@ IFNULL(sum(IFNULL( b.amount, 0 )),0) FROM shop_salesman_order b WHERE b.user_id = a.open_id and order_status=2 and revenue_type=2 WHERE order_status=2 and revenue_type=2 AND b.sales_user_id = #{openId} ) AS invitationRevenue, @@ -181,16 +175,13 @@ IFNULL(sum(IFNULL( b.amount, 0 )),0) FROM shop_salesman_order b WHERE b.user_id = a.open_id and order_status=1 WHERE order_status=1 AND b.sales_user_id = #{openId} ) AS djsRevenue, ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount, ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount, (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=1) as invitationCount, (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=2) as customerCount from biz_user a where
