渠道码

src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java

@@ -5622,7 +5622,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                         }
                         insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
                     }else if(orders.getIsSupplement() == 2){
-                        Orders oldOrders = baseMapper.selectById(orders.getOrdersId());
+                        Orders oldOrders = baseMapper.selectById(orders.getOldOrdersId());
                         int timeDifference = orders.getDuration()-oldOrders.getDuration();
                         if(timeDifference>0){
                             ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOldOrdersId()).last(" order by artificer_time_id desc limit 1 "));

src/main/java/com/sqx/modules/bl/commission/qds/controller/app/AppQdsController.java

@@ -4,6 +4,7 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.bl.commission.qds.entity.QdsApply;
 import com.sqx.modules.bl.commission.qds.service.QdsApplyService;
+import com.sqx.modules.bl.commission.qds.service.QdsCodeService;
 import com.sqx.modules.bl.commission.qds.service.QdsDataService;
 import com.sqx.modules.bl.commission.qds.service.QdsLmService;
 import io.swagger.annotations.Api;
@@ -31,6 +32,9 @@ public class AppQdsController {
     @Autowired
     private QdsDataService dataService;
 
+    @Autowired
+    private QdsCodeService codeService;
+
     @GetMapping("/lmList")
     @ApiOperation("类目列表")
     public Result lmList(){
@@ -71,5 +75,4 @@ public class AppQdsController {
     public Result myQds(@RequestAttribute Long userId){
         return dataService.myQds(userId);
     }
-
 }

src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsCodeDao.java

@@ -7,9 +7,12 @@ import com.sqx.modules.bl.commission.qds.entity.QdsCode;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface QdsCodeDao extends BaseMapper<QdsCode> {
     IPage<QdsCode> findPage(Page<QdsCode> page, @Param("params") QdsCode qdsCode);
+    List<QdsCode> findList(Long userId);
     int add(QdsCode qdsCode);
     int update(QdsCode qdsCode);
     IPage<QdsCode> findUserPage(Page<QdsCode> page, @Param("params") QdsCode qdsCode);

src/main/java/com/sqx/modules/bl/commission/qds/dao/QdsDataDao.java

@@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Param;
 public interface QdsDataDao extends BaseMapper<QdsData> {
     IPage<QdsData> findPage(Page<QdsData> page, @Param("params") QdsData qdsData);
     IPage<QdsData> invitationUserPage(Page<QdsData> page, @Param("params") QdsData qdsData);
+    QdsData findQds(QdsData qdsData);
 }

src/main/java/com/sqx/modules/bl/commission/qds/service/impl/QdsDataServiceImpl.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.modules.app.entity.UserMoneyDetails;
 import com.sqx.modules.app.service.UserMoneyDetailsService;
 import com.sqx.modules.artificer.entity.Period;
+import com.sqx.modules.bl.commission.jjr.entity.JjrData;
+import com.sqx.modules.bl.commission.qds.dao.QdsCodeDao;
 import com.sqx.modules.bl.commission.qds.dao.QdsDataDao;
+import com.sqx.modules.bl.commission.qds.entity.QdsCode;
 import com.sqx.modules.utils.PeriodUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +29,8 @@ public class QdsDataServiceImpl extends ServiceImpl<QdsDataDao, QdsData> impleme
 
     @Autowired
     private UserMoneyDetailsService userMoneyDetailsService;
+    @Autowired
+    private QdsCodeDao qdsCodeDao;
 
     @Override
     public Result findPage(QdsData qdsData){
@@ -99,10 +104,12 @@ public class QdsDataServiceImpl extends ServiceImpl<QdsDataDao, QdsData> impleme
                 .mapToDouble(UserMoneyDetails -> UserMoneyDetails.getMoney().doubleValue())
                 .sum();
         result.put("notCredited",notCredited);//未入账
-
+        List<QdsCode> codeList = qdsCodeDao.findList(userId);
-
+        result.put("codeList",codeList);//渠道码
-
+        QdsData qdsData = new QdsData();
-
+        qdsData.setUserId(userId);
+        qdsData = baseMapper.findQds(qdsData);
+        result.put("name",qdsData.getName());//渠道商名称
         return Result.success().put("data",result);
     }
 }

src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java

@@ -116,7 +116,11 @@ public class MaterialArtificerServiceImpl extends ServiceImpl<MaterialArtificerM
         for (int i = 0; i < materialMassageList.size(); i++){
             for (int j = 0; j < materialArtificers.size(); j++){
                 if(materialMassageList.get(i).getMaterialId().equals(materialArtificers.get(j).getMaterialId())){
-                    materialArtificers.get(j).setResidue(materialArtificers.get(j).getResidue().subtract(materialMassageList.get(i).getConsume()));
+                    BigDecimal reside = BigDecimal.ZERO;
+                    if(materialArtificers.get(j).getResidue()!=null){
+                        reside = materialArtificers.get(j).getResidue();
+                    }
+                    materialArtificers.get(j).setResidue(reside.subtract(materialMassageList.get(i).getConsume()));
                     baseMapper.updateById(materialArtificers.get(j));
                     //修改剩余量，执行新增历史记录
                     MaterialRecord materialRecord = new MaterialRecord();

src/main/resources/application-prod.yml

@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://127.0.0.1:3307/anmo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
+            url: jdbc:mysql://175.178.80.95:3306/anmo?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
-            username: root
+            username: anmo
-            password: root
+            password: ryxyhfYMPm2rhdam
             initial-size: 10
             max-active: 100
             min-idle: 10

src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/main/resources/mapper/bl/commission/qds/QdsCodeDao.xml

@@ -35,6 +35,26 @@
         order by a.id desc
     </select>
 
+    <select id="findList" resultType="com.sqx.modules.bl.commission.qds.entity.QdsCode">
+        select
+        a.id,
+        a.name,
+        a.code,
+        a.lm,
+        a.user_id as userId,
+        a.rate,
+        a.cost,
+        a.start_date as startDate,
+        a.end_date as endDate,
+        a.address,
+        a.create_time as createTime,
+        a.remarks,
+        a.code_image as codeImage
+        from bl_qds_code a
+        where a.user_id = #{userId}
+        order by a.id desc
+    </select>
+
     <insert id="add" useGeneratedKeys="true"  keyProperty="id" parameterType="com.sqx.modules.bl.commission.qds.entity.QdsCode">
         insert into bl_qds_code(
             name,

src/main/resources/mapper/bl/commission/qds/QdsDataDao.xml

@@ -76,4 +76,13 @@
         order by b.user_id desc
     </select>
 
+    <select id="findQds" resultType="com.sqx.modules.bl.commission.qds.entity.QdsData">
+        select
+            x.id,x.user_id,y.avatar,y.user_name,x.name,x.phone,x.remarks,x.create_time,x.status,x.opinion,y.invitation_code,x.approve_time
+        from bl_qds_apply x
+        inner join tb_user y on x.user_id = y.user_id
+        where x.status= 1
+        and x.user_id = #{userId}
+    </select>
+
 </mapper>