Merge remote-tracking branch 'origin/jxl_1214_refund' into dev_merchant

# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-test.yml
#	liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -184,12 +184,26 @@ liquidnet:
     app-name: demo
     client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
     client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
+#  express:
+#    shunfeng:
+#      url: "https://butler-dev.sit.sf-express.com"
+#      sk: 21e9a70f677a2bf29dfa2b3bead4f018
+#      appid: 557104628450889728
+#      custid: 7551234567
+#      jCompany: 北京正在映画互联网有限公司
+#      jContact: 摩登天空票务部
+#      jTel: 4006310750
+#      jProvince: 北京
+#      jCity: 北京市
+#      jAddress: 朝阳区广渠路1号北京市商业储运公司3-12号 摩登天空
+#      expressType: 2 # 默认顺丰特快
+#      depositumInfo: 演出纸质票
   express:
     shunfeng:
-      url: "https://butler-dev.sit.sf-express.com"
-      sk: 21e9a70f677a2bf29dfa2b3bead4f018
-      appid: 557104628450889728
-      custid: '7551234567'
+      url: https://butler-ms.sf-express.com
+      sk: ab85956fcb97382e05396b67f3666098
+      appid: 572271814718803968
+      custid: '0102790784'
       jCompany: 北京正在映画互联网有限公司
       jContact: 摩登天空票务部
       jTel: 4006310750

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

@@ -50,10 +50,12 @@
                 and amo.source = #{source}
             </if>
             <if test="paymentAtStart != null  and paymentAtStart != ''">
-                and amo.payment_at &gt; #{paymentAtStart}
+#                 and amo.payment_at &gt; #{paymentAtStart}
+                and amo.payment_at <![CDATA[>=]]> #{paymentAtStart}
             </if>
             <if test="paymentAtEnd != null  and paymentAtEnd != ''">
-                and amo.payment_at &lt; #{paymentAtEnd}
+#                 and amo.payment_at &lt; #{paymentAtEnd}
+                and amo.payment_at <![CDATA[<=]]> #{paymentAtEnd}
             </if>
         </where>
         order by amo.created_at desc

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformCandyTaskClient.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.base.ResponseDto;
 import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 
 @Component
@@ -27,4 +28,7 @@ public interface FeignPlatformCandyTaskClient {
 
     @PutMapping("ccoupon/task/due/user")
     ResponseDto<String> dueProcessForUser();
+
+    @GetMapping("followDoTask/doTask")
+    ResponseDto doTask();
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java

@@ -151,4 +151,22 @@ public class PlatformTaskHandler {
         }
     }
 
+
+    // 关注任务加积分脚本
+    @XxlJob(value = "sev-platform:followDoTask")
+    public ReturnT<String> followDoTask() {
+        try {
+            ResponseDto<String> dto = feignPlatformCandyTaskClient.doTask();
+            String dtoStr = JsonUtils.toJson(dto);
+            log.info("result of handler:{}", dtoStr);
+            ReturnT<String> success = ReturnT.SUCCESS;
+            success.setMsg(dtoStr);
+            return success;
+        } catch (Exception e) {
+            log.error("exception of handler:{}", e.getMessage(), e);
+            ReturnT<String> fail = ReturnT.FAIL;
+            fail.setMsg(e.getLocalizedMessage());
+            return fail;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java

@@ -325,6 +325,10 @@ public class KylinOrderTicketsRefundServiceImpl {
     @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         try {
+            Thread.sleep(1000 * 60);
+            log.info("expressPlaceParams [sendExpressType:{}, expressContacts:{}, expressPhone:{}, sendExpressAddress:{}, appointmentTime:{}, orderRefundId:{}]",
+                    sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderRefundId);
+
             expressContacts = (null == expressContacts) ? "" : expressContacts;
             expressPhone = (null == expressPhone) ? "" : expressPhone;
             sendExpressAddress = (null == sendExpressAddress) ? "" : sendExpressAddress;
@@ -342,6 +346,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 if (isRefundExpress == 1) { // 1用户承担 0无 公司月结
                     hBody.put("payMethod", "1");// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
                 } else {
+                    // 收方付 派方小哥巴枪挂月结
                     hBody.put("payMethod", "2");// 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
                 }
                 hBody.put("expressType", expressType.toString());// 顺丰特快
@@ -365,10 +370,44 @@ public class KylinOrderTicketsRefundServiceImpl {
                 try {
                     hashMap = JsonUtils.fromJson(result, HashMap.class);
                 } catch (Exception e) {
-                    log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
-                            sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
                     log.error("expressPlaceFromJsonException e:[{}]", e);
                 }
+                // 生成快递单 失败也生成记录备用
+                HashMap hashMapResult = (HashMap) hashMap.get("result");
+                // 生成预快递单 REDIS 队列入数据库
+                LocalDateTime now = LocalDateTime.now();
+                LinkedList<String> sqls = CollectionUtil.linkedListString();
+                sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
+                LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                String remark = (String) hashMapResult.get("remark");
+                String proName = (String) hashMapResult.get("proName");
+                String goodsValueTotal = (String) hashMapResult.get("goodsValueTotal");
+                String goodsNumber = (String) hashMapResult.get("goodsNumber");
+                remark = (null == remark) ? "" : remark;
+                proName = (null == proName) ? "" : proName;
+                goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
+                goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
+                String mailno = (String) hashMapResult.get("mailno");
+                String filterResult = (String) hashMapResult.get("filter_result");
+                String cargoTypeCode = (String) hashMapResult.get("cargoTypeCode");
+                String limitTypeCode = (String) hashMapResult.get("limitTypeCode");
+                String expressTypeCode = (String) hashMapResult.get("expressTypeCode");
+                mailno = (null == mailno) ? "" : mailno;
+                filterResult = (null == filterResult) ? "" : filterResult;
+                cargoTypeCode = (null == cargoTypeCode) ? "" : cargoTypeCode;
+                limitTypeCode = (null == limitTypeCode) ? "" : limitTypeCode;
+                expressTypeCode = (null == expressTypeCode) ? "" : expressTypeCode;
+                sqlsDataA.add(new Object[]{
+                        orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId,
+                        OrderExpressCode, mailno, expressType, filterResult, remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
+                        , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
+                        , proName, cargoTypeCode, limitTypeCode, expressTypeCode, goodsValueTotal, goodsNumber
+                        , now
+                });
+                queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_REFUND_EXPRESS.getKey(),
+                        SqlMapping.gets(sqls, sqlsDataA));
+
+
                 if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
                     String msg = "";
                     if (null == hashMap.get("succ")) {
@@ -376,33 +415,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                     } else {
                         msg = (String) hashMap.get("msg");
                     }
-                    log.info("expressPlaceParams sendExpressType:[{}], expressNumber:[{}], expressContacts:[{}], expressPhone:[{}], sendExpressAddress:[{}], appointmentTime:[{}], orderTicketVo:[{}], performanceVo:[{}]",
-                            sendExpressType, expressNumber, expressContacts, expressPhone, sendExpressAddress, appointmentTime, orderTicketVo, performanceVo);
-                    log.error("expressPlaceResultError msg:[{}]", msg);
-                } else {
-                    HashMap hashMapResult = (HashMap) hashMap.get("result");
-                    // 生成预快递单 REDIS 队列入数据库
-                    LocalDateTime now = LocalDateTime.now();
-                    LinkedList<String> sqls = CollectionUtil.linkedListString();
-                    sqls.add(SqlMapping.get("kylin_order_refund.refundOrderExpress"));
-                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                    String remark = (String) hashMapResult.get("remark");
-                    String proName = (String) hashMapResult.get("proName");
-                    String goodsValueTotal = (String) hashMapResult.get("goodsValueTotal");
-                    String goodsNumber = (String) hashMapResult.get("goodsNumber");
-                    remark = (null == remark) ? "" : remark;
-                    proName = (null == proName) ? "" : proName;
-                    goodsValueTotal = (null == goodsValueTotal) ? "" : goodsValueTotal;
-                    goodsNumber = (null == goodsNumber) ? "" : goodsNumber;
-                    sqlsDataA.add(new Object[]{
-                            orderExpressId, orderTicketVo.getPerformanceId(), orderTicketVo.getOrderTicketsId(), orderRefundId, OrderExpressCode, hashMapResult.get("mailno"), expressType, hashMapResult.get("filter_result"), remark, KylinTableStatusConst.ORDER_EXPRESS_STATUS2
-                            , 2, sendExpressType, expressContacts, expressPhone, sendExpressAddress, appointmentTime
-                            , proName, hashMapResult.get("cargoTypeCode"), hashMapResult.get("limitTypeCode"), hashMapResult.get("expressTypeCode"), goodsValueTotal, goodsNumber
-                            , now
-                    });
-                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_REFUND_EXPRESS.getKey(),
-                            SqlMapping.gets(sqls, sqlsDataA));
-
+                } else { // 成功下单记录缓存
                     KylinOrderExpressVo kylinOrderExpressVo = KylinOrderExpressVo.getNew();
                     kylinOrderExpressVo.setOrderExpressId(orderExpressId);
                     kylinOrderExpressVo.setOrderTicketsId(orderTicketVo.getOrderTicketsId());
@@ -413,7 +426,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                     dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
                 }
             } else if (sendExpressType == 2) { // 自主发货
-                // 生成预快递单 REDIS 队列入数据库
+                // 生成快递单 REDIS 队列入数据库
                 String orderExpressId = IDGenerator.nextSnowId();
                 String OrderExpressCode = "NOWUR" + orderExpressId;
                 LocalDateTime now = LocalDateTime.now();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/sweet/TaskController.java

+package com.liquidnet.service.platform.controller.sweet;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
+import com.liquidnet.service.platform.utils.DataUtils;
+import com.liquidnet.service.sweet.entity.SweetWechatUsers;
+import com.liquidnet.service.sweet.mapper.SweetWechatUsersMapper;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+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.RestController;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 关注任务加积分脚本
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-12-28
+ */
+@Api(tags = "关注任务加积分脚本")
+@Slf4j
+@RestController
+@RequestMapping("followDoTask")
+public class TaskController {
+
+    @Autowired
+    private SweetWechatUsersMapper usersMapper;
+
+    @Autowired
+    private FeignStoneIntegralClient feignStoneIntegralClient;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    @GetMapping("doTask")
+    @ApiOperation("退款回调")
+    public ResponseDto doTask() {
+        int size = 1000;
+
+        LocalDateTime localDateTime = LocalDateTime.now();
+        LocalDateTime newTime = localDateTime.minusMinutes(10);
+//        String timeStr = "2021-12-28 00:00:00";
+//        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//        LocalDateTime dateTime = LocalDateTime.parse(timeStr, df);
+        // 获取总记录数
+        Integer count = usersMapper.selectCount(
+                Wrappers.lambdaQuery(SweetWechatUsers.class)
+                        .gt(SweetWechatUsers::getCreatedAt, newTime)
+                        .eq(SweetWechatUsers::getType, 2)
+        );
+        // 总page
+        int countPage = (int) Math.ceil(count / size);
+        countPage = countPage + 1;
+        for (int page = 0; page < countPage; page++) {
+            List<SweetWechatUsers> sweetWechatUsers = usersMapper.selectList(
+                    Wrappers.lambdaQuery(SweetWechatUsers.class)
+                            .gt(SweetWechatUsers::getCreatedAt, newTime)
+                            .last("limit " + (page * size) + "," + ((page + 1) * size))
+            );
+            for (SweetWechatUsers info : sweetWechatUsers) {
+                try {
+                    SweetAppletUsersVo sweetAppletUsers = dataUtils.getSweetAppletUsersOfUnionId(info.getUnionId());
+                    if (sweetAppletUsers != null) {
+                        if (sweetAppletUsers.getUserId() != null && !sweetAppletUsers.getUserId().isEmpty()) {
+                            log.info("followDoTask userId:{}", sweetAppletUsers.getUserId());
+                            ResponseDto<HashMap<String, Object>> hashMapResponseDto = feignStoneIntegralClient.doTask(4, sweetAppletUsers.getUserId());
+                            //log.info("followDoTask res:{}", hashMapResponseDto);
+                        }
+                    }
+                } catch (Exception e) {
+
+                }
+            }
+        }
+        return ResponseDto.success();
+    }
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -16,6 +16,8 @@ import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import com.liquidnet.service.slime.constant.SlimeRedisConst;
 import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
+import com.liquidnet.service.sweet.constant.SweetConstant;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -424,4 +426,15 @@ public class DataUtils {
     public String getSessionCode(String ticketTimeId) {
         return (String) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.TIMES_SESSION_CODE.concat(ticketTimeId));
     }
+
+    public SweetAppletUsersVo getSweetAppletUsersOfUnionId(String unionId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_UNIONID.concat(unionId);
+        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
+        if (null == obj) {
+            return null;
+        } else {
+            SweetAppletUsersVo sweetAppletUsersVo = (SweetAppletUsersVo) obj;
+            return sweetAppletUsersVo;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreLogsServiceImpl.java

@@ -88,15 +88,15 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
             }
             Date userMonth = DateUtil.parse(vo.getCurrentMonth() == null ? DateUtil.getNowTime() : vo.getCurrentMonth(), "yyyy-MM");
             int monthScore = vo.getMonthScore() == null ? 0 : vo.getMonthScore();
-            if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
-                if ((monthScore + score) >= monthMax) {
-                    score = monthMax - monthScore;
-                }
-            } else {
-                if (score >= monthMax) {
-                    score = monthMax;
-                }
-            }
+//            if (DateUtil.compareMonth(userMonth, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM")) == 0) {//当月
+//                if ((monthScore + score) >= monthMax) {
+//                    score = monthMax - monthScore;
+//                }
+//            } else {
+//                if (score >= monthMax) {
+//                    score = monthMax;
+//                }
+//            }
 //            Date userDay = DateUtil.parse(vo.getCurrentDay() == null ? DateUtil.getNowTime() : vo.getCurrentDay(), "yyyy-MM-dd");
 //            int dayScore = vo.getDayScore() == null ? 0 : vo.getDayScore();
 //            if (DateUtil.compareDay(userDay, DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd")) == 0) {//当日

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/SweetMathUtil.java

@@ -39,28 +39,31 @@ public class SweetMathUtil {
     }
 
     public static void main(String[] args) {
-        /*RedisConfig redisConfig = new RedisConfig();
-        redisConfig.getRedisTemplateByDb(MathUtil.getIndex("1"));*/
+        // 演出
 //        getIndex("kylin:performances:id:296290722991104003684701");
-//        getIndex("sweet:integralActivity:prizeNum:activityId:499142611246284803622253:prizeId:499142823268352009440982");
-//        getIndex("kylin:order:coupon:id:397983761946132487870836");
-//        getIndex("sweet:integralActivity:list");
-//        getIndex("kylin:order:id:325244198036357120519956");
 //        getIndex("kylin:performances:roadShowId:5936345");
 //        getIndex("kylin:performances:roadShowId:570");
-//        getIndex("kylin:order:refund:address");
+//        getIndex("kylin:performances_inventory:ticket:id:245075780722810880782444:surplusGeneral");
+//        getIndex("kylin:performances:notice");
+        // 快递
+//        getIndex("kylin:express:modules");
+        // 订单
+//        getIndex("kylin:order:coupon:id:397983761946132487870836");
+//        getIndex("kylin:order:id:325244198036357120519956");
+        // sweet积分活动
+//        getIndex("sweet:integralActivity:prizeNum:activityId:499142611246284803622253:prizeId:499142823268352009440982");
+//        getIndex("sweet:integralActivity:list");
+        // sweet用户
+//        getIndex("sweet:user:service:unionId:oSpYSs1NH3glVRvVLNmUKqyjxKng:type:2");
+//        getIndex("sweet:user:applet:unionid:oSpYSs1NH3glVRvVLNmUKqyjxKng");
+//        getIndex("sweet:user:applet:mobile:17638582147");
+        // basicServices
 //        getIndex("basicServices:upushList:IOS");
-//        getIndex("jxl-lock-test");
-//        getIndex("kylin:performances:id:499112736168099840841262");
-//        getIndex("kylin:performances:id:549875278160650249766815");
-//        getIndex("sweet:user:applet:mobile:18548596019");
-        getIndex("sweet:user:service:unionId:oSpYSs_6THPGafL3HqgGQA1uuEoE:type:1");
 //        getIndex("basicServices:upushList:Android");
+
 //        getIndex("basicServices:zhengzaiAppVersionsAndroid");
 //        getIndex("basicServices:zhengzaiAppVersionsIos");
 //        getIndex("basicServices:zhengzaiCheckAppVersionsAndroid");
 //        getIndex("basicServices:zhengzaiCheckAppVersionsIos");
-//        getIndex("kylin:performances_inventory:ticket:id:245075780722810880782444:surplusGeneral");
-//        getIndex("kylin:performances:notice");
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatMaoDengController.java

@@ -33,7 +33,7 @@ public class SweetWechatMaoDengController {
 
     @GetMapping("/backData")
     @ApiOperation("返回文字图片")
-    public ResponseDto<SweetMaoDengVo> backDatas(String userId, String maoId) {
+    public ResponseDto<SweetMaoDengVo> backDatas(String userId) {
         SweetWechatUsersVo wechatUsers = redisUtils.getSweetWechatUsersOfUnionId(userId, 2);
         if (null == wechatUsers) {
             return ResponseDto.failure("获取信息失败");
@@ -51,7 +51,7 @@ public class SweetWechatMaoDengController {
         return ResponseDto.failure("获取信息失败");
     }
 
-    @PostMapping("/backData")
+    @PostMapping("/addBuilderImg")
     @ApiOperation("存生成的图")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "userId", value = "userId"),