| @@ -63,7 +63,7 @@ public class WxAppinfoController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private AsyncTaskExecutor asyncTaskExecutor; | private AsyncTaskExecutor asyncTaskExecutor; | ||||
| @ApiOperation("加载二维码") | |||||
| @ApiOperation("加载老数据二维码") | |||||
| @GetMapping("/updateQrCode") | @GetMapping("/updateQrCode") | ||||
| public void updateQrCode(String p)throws ServletException, IOException { | public void updateQrCode(String p)throws ServletException, IOException { | ||||
| if("xlldxx".equals(p)){ | if("xlldxx".equals(p)){ | ||||
| @@ -74,17 +74,14 @@ public class WxAppinfoController extends BaseController { | |||||
| asyncTaskExecutor.execute(new Runnable() { | asyncTaskExecutor.execute(new Runnable() { | ||||
| @Override | @Override | ||||
| public void run() { | public void run() { | ||||
| // String param = "t:md:"+merchant.getId(); | |||||
| // ResultData resultData = this.exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); | |||||
| // Map<String,String> map = (Map)resultData.data; | |||||
| // String url = map.get("url"); | |||||
| // merchant.setQrCode(url); | |||||
| // wxMerchantMapper.updateByPrimaryKeySelective(merchant); | |||||
| String param = "t:md:"+merchant.getId(); | |||||
| ResultData resultData = exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); | |||||
| Map<String,String> map = (Map)resultData.data; | |||||
| String url = map.get("url"); | |||||
| merchant.setQrCode(url); | |||||
| wxMerchantMapper.updateByPrimaryKeySelective(merchant); | |||||
| } | } | ||||
| }); | }); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -66,7 +66,9 @@ | |||||
| <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultType="hashmap"> | <select id="queryBillDailyList" parameterType="com.iformall.domain.po.WxBillDaily" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | ||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | |||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay, | |||||
| case when br.status=1 then br.owe else 0 end owe | |||||
| ,br.`status`, | |||||
| m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,br.`merchant_id` merchantId, | m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,br.`merchant_id` merchantId, | ||||
| br.shop_id shopId,br.type,br.`rent_shop_type` rentShopType,br.pay_way payWay,br.price_detail priceDetail | br.shop_id shopId,br.type,br.`rent_shop_type` rentShopType,br.pay_way payWay,br.price_detail priceDetail | ||||
| from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id | ||||
| @@ -67,7 +67,9 @@ | |||||
| <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultType="hashmap"> | <select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOther" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | ||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | |||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay, | |||||
| case when br.status=1 then br.owe else 0 end owe | |||||
| ,br.`status`, | |||||
| m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,br.`merchant_id` merchantId, | m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,br.`merchant_id` merchantId, | ||||
| br.shop_id shopId,br.name,br.comments,br.`rent_shop_type` rentShopType,br.pay_way payWay | br.shop_id shopId,br.name,br.comments,br.`rent_shop_type` rentShopType,br.pay_way payWay | ||||
| from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id | from wx_bill_other br left join wx_merchant m on br.merchant_id=m.id | ||||
| @@ -80,7 +80,9 @@ | |||||
| <select id="queryBillPropertyList" parameterType="com.iformall.domain.po.WxBillProperty" resultType="hashmap"> | <select id="queryBillPropertyList" parameterType="com.iformall.domain.po.WxBillProperty" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | ||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | |||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay, | |||||
| case when br.status=1 then br.owe else 0 end owe | |||||
| ,br.`status`, | |||||
| br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | ||||
| br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`period`, | br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`period`, | ||||
| br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime, | br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime, | ||||
| @@ -86,7 +86,9 @@ | |||||
| <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxRentContract" resultType="hashmap"> | <select id="queryBillRentList" parameterType="com.iformall.domain.po.WxRentContract" resultType="hashmap"> | ||||
| select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, | ||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, | |||||
| br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay, | |||||
| case when br.status=1 then br.owe else 0 end owe | |||||
| ,br.`status`, | |||||
| br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, | ||||
| br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,r.type rentType,r.pay_ratio payRatio, | br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,r.type rentType,r.pay_ratio payRatio, | ||||
| br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,br.`period`, | br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,br.`period`, | ||||
| @@ -522,7 +522,7 @@ | |||||
| o.order_status,o.create_date,o.update_date,o.detail,'[多商户交易]' merchant_name,cubi.`name` c_user_name,cubi.phone | o.order_status,o.create_date,o.update_date,o.detail,'[多商户交易]' merchant_name,cubi.`name` c_user_name,cubi.phone | ||||
| from | from | ||||
| ( | ( | ||||
| select o.* from wx_order o where o.type=0 and o.order_status in (1,4) and o.id in( | |||||
| select o.* from wx_order o where o.type=0 and o.order_status in (0,2,3,1,4) and o.id in( | |||||
| select o.id from wx_order o left join wx_coupon_merchant cm | select o.id from wx_order o left join wx_coupon_merchant cm | ||||
| on o.product_id=cm.product_id group by o.id having count(o.id)>1)) o | on o.product_id=cm.product_id group by o.id having count(o.id)>1)) o | ||||
| left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | ||||
| @@ -531,7 +531,7 @@ | |||||
| o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone | o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone | ||||
| from( | from( | ||||
| select o.*,cm.merchant_id from ( | select o.*,cm.merchant_id from ( | ||||
| select o.* from wx_order o where o.type=0 and o.order_status in (1,4) and o.id not in( | |||||
| select o.* from wx_order o where o.type=0 and o.order_status in (0,2,3,1,4) and o.id not in( | |||||
| select o.id from wx_order o left join wx_coupon_merchant cm | select o.id from wx_order o left join wx_coupon_merchant cm | ||||
| on o.product_id=cm.product_id group by o.id having count(o.id)>1) | on o.product_id=cm.product_id group by o.id having count(o.id)>1) | ||||
| ) o | ) o | ||||
| @@ -539,7 +539,7 @@ | |||||
| union all | union all | ||||
| select o.*,mbu.merchant_id from wx_order o | select o.*,mbu.merchant_id from wx_order o | ||||
| left join wx_merchant_b_user mbu on o.product_id=mbu.id | left join wx_merchant_b_user mbu on o.product_id=mbu.id | ||||
| where o.type in (1,2) and o.order_status in (1,4) ) o | |||||
| where o.type in (1,2) and o.order_status in (0,2,3,1,4) ) o | |||||
| left join wx_merchant m on o.merchant_id=m.id | left join wx_merchant m on o.merchant_id=m.id | ||||
| left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | ||||
| ) o | ) o | ||||