Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -113,7 +113,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
                     taRedPacket.setStartDate(LocalDateTime.now().plusDays(1));
                     taRedPacket.setQrcode(taDrainage.getQrCode());
                     taRedPacket.setEndDate(DateUtils.dayToLocalDateime(taDrainage.getEndDate()));
-                    iTaRedPacketService.initializeRedPacket(taRedPacket);
+                    iTaRedPacketService.initializeRedPacket(taRedPacket,orgId);
 
                     taDrainage.setH5Address(String.format(taH5Template.getActivityUrl(), activityId));
                     taDrainage.setActivityType(taH5Template.getActivityType());

src/main/java/com/huiju/estateagents/redpack/mapper/TaRedPacketMapper.java

@@ -55,6 +55,8 @@ public interface TaRedPacketMapper extends BaseMapper<TaRedPacket> {
      * @return
      */
     Integer initRedPacketClient(@Param("activityId") String activityId,
+                                @Param("activityName") String activityName,
+                                @Param("miniAppName") String miniAppName,
                                 @Param("templeActivityId") String templeActivityId);
 
     /**

src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java

@@ -25,7 +25,7 @@ public interface ITaRedPacketService extends IService<TaRedPacket> {
      * @return
      */
     @Transactional
-    ResponseBean initializeRedPacket(TaRedPacket record);
+    ResponseBean initializeRedPacket(TaRedPacket record,Integer orgId);
 
 
     /**

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java

@@ -10,8 +10,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.redpack.entity.TaH5Images;
+import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.mapper.TaH5ImagesMapper;
 import com.huiju.estateagents.redpack.mapper.TaRedPacketMapper;
@@ -49,17 +52,26 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     @Autowired
     private TaH5ImagesMapper taH5ImagesMapper;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
     @Override
     @Transactional
-    public ResponseBean initializeRedPacket(TaRedPacket record) {
+    public ResponseBean initializeRedPacket(TaRedPacket record,Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 获取小程序信息
+        QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
+        miniappQueryWrapper.eq("org_id",orgId);
+        miniappQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
+
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(),record.getTempleActivityId(), record.getOrgId());
-        taRedPacketMapper.initRedPacketHelp(record.getActivityId(),record.getTempleActivityId());
-        taRedPacketMapper.initRedPacketClient(record.getActivityId(),record.getTempleActivityId());
-        taRedPacketMapper.initRedPacketMoney(record.getActivityId(),record.getTempleActivityId());
-        taRedPacketMapper.initRedPacketImages(record.getActivityId(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getOrgId());
+        taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketImages(record.getActivityId(), record.getTempleActivityId());
         responseBean.addSuccess("success");
         return responseBean;
     }
@@ -111,16 +123,16 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     @Override
     public ResponseBean listVisitRecordByCondition(Integer pageNum, Integer pageSize, LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        IPage<TaCustomerFrom> pg = new Page<>(pageNum,pageSize);
-        responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg,startTime,endTime,drainageId,phone,sharePersonPhone,orgId));
+        IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taRedPacketMapper.listVisitRecordByCondition(pg, startTime, endTime, drainageId, phone, sharePersonPhone, orgId));
         return responseBean;
     }
 
     @Override
-    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId,String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
+    public void exportVisitRecordByCondition(LocalDate startTime, LocalDate endTime, String drainageId, String phone, String sharePersonPhone, Integer orgId, HttpServletResponse response) throws Exception {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
-        List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime,endTime,drainageId,phone,sharePersonPhone,orgId);
+        List<RedPacketVisitRecordtExport> records = taRedPacketMapper.exportVisitRecordByCondition(startTime, endTime, drainageId, phone, sharePersonPhone, orgId);
         String fileName = URLEncoder.encode("客户数据", "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         EasyExcel.write(response.getOutputStream(), RedPacketVisitRecordtExport.class).sheet("客户数据").doWrite(records);

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -191,6 +191,8 @@ public class WxPayServiceImpl implements IWxPayService {
         taOrgAccountDetailedList.setSignType(1);
         taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
         taOrgAccountDetailedList.setRemark("线上充值");
+        taOrgAccountDetailedList.setUserId(taOrgOrder.getUserId());
+        taOrgAccountDetailedList.setUserName(taOrgOrder.getUserName());
         taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
         //添加账户金额
         taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() + taOrgOrder.getAmount());

src/main/resources/mapper/redpack/TaRedPacketMapper.xml

@@ -75,9 +75,9 @@
             `remark`
          ) SELECT
             #{activityId},
-            `mch_name`,
+            #{miniAppName},
             `blessing`,
-            `activity_name`,
+            #{activityName},
             `remark`
         FROM
             ta_red_packet_client t2
@@ -118,7 +118,7 @@
         SELECT
             t.*,
             t2.nickname,
-            t2.NAME,
+            t2.name,
             t2.avatarurl,
             t2.phone,
             t3.nickname sharePersonNickname,
@@ -126,7 +126,7 @@
         FROM
             ta_customer_from t
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
-            LEFT JOIN ta_person t3 ON t.share_person_id = t2.person_id
+            LEFT JOIN ta_person t3 ON t.share_person_id = t3.person_id
         WHERE
             t.org_id = #{orgId}
             AND t.target_type IN ( 'h5', 'dynamic' )