MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -261,16 +261,16 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         Calendar rightNow = Calendar.getInstance();
         Map<String, Object> bindingMap = new HashMap<>();
 
-        bindingMap.put("username", jsonHandle(maps,"username"));
-        bindingMap.put("s", jsonHandle(maps,"s"));
-        bindingMap.put("post", jsonHandle(maps,"post"));
+        bindingMap.put("username", jsonHandle(maps,"name"));
+        bindingMap.put("s", jsonHandle(maps,"sex"));
+        bindingMap.put("post", jsonHandle(maps,"apply_post"));
         bindingMap.put("idcard", jsonHandle(maps,"idcard"));
-        bindingMap.put("phone", jsonHandle(maps,"phone"));
+        bindingMap.put("phone", jsonHandle(maps,"telphone"));
         bindingMap.put("school", jsonHandle(maps,"school"));
-        bindingMap.put("edu", jsonHandle(maps,"edu"));
+        bindingMap.put("edu", jsonHandle(maps,"education"));
         bindingMap.put("major", jsonHandle(maps,"major"));
-        bindingMap.put("cname", jsonHandle(maps,"cname"));
-        bindingMap.put("cphone", jsonHandle(maps,"cphone"));
+        bindingMap.put("cname", jsonHandle(maps,"unit_contact"));
+        bindingMap.put("cphone", jsonHandle(maps,"unit_tel"));
         bindingMap.put("image", ALIYUN_OSS_ENDPOINT + "/" + jsonHandle(maps,"commitment_electr_signature"));
         bindingMap.put("y", Convert.toStr(rightNow.get(Calendar.YEAR)));
         bindingMap.put("m", rightNow.get(Calendar.MONTH) + 1);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -135,4 +135,6 @@ public class GoodsBankAddBo {
     private String externalLink;
     @ApiModelProperty("是否外链商品：0否 1是")
     private Integer externalLinkStatus;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -164,4 +164,6 @@ public class GoodsBankEditBo {
     private String externalLink;
     @ApiModelProperty("是否外链商品：0否 1是")
     private Integer externalLinkStatus;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -247,7 +247,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                     //二建/二造继教班级过滤
                     String businessName = iGoodsService.getGoodsBusinessName(item.getGoodsId());
                     if (businessName.contains("继续教育二级建造师") || businessName.contains("继续教育二级造价师")){
-                        if (gradeVo.getClassStatus() == 1 &&
+                        if (Validator.isNotEmpty(gradeVo.getClassStatus())&&gradeVo.getClassStatus() == 1 &&
                                 (gradeVo.getClassStartTime() > DateUtils.getNowTime() || gradeVo.getClassEndTime() < DateUtils.getNowTime())){
                             //过期班级
                             return false;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderBusinessConfig.java

@@ -42,4 +42,6 @@ private static final long serialVersionUID=1L;
     private Integer gradeType;
     /** 主图上传*/
     private String mainImg;
+    /** 排序值*/
+    private Integer configSort;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -848,6 +848,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 billGoodsList.add(billGoodsAddBo);
 //                //商品是否有活动模考
 //                iUserMockSubscribeService.addActivityMock(orderGoods.getGoodsId(),add.getUserId());
+                Goods goods = iGoodsService.getById(orderGoods.getGoodsId());
+                if (StringUtils.isNotBlank(goods.getQuestionRelIds())){
+                    //关联题库商品
+                    questionGoodsHandle(orderGoods,goods);
+                }
             }
             billSheetAddBo.setGoodsList(billGoodsList);
             billRs = iOrderBillSheetService.placeBillInputOrder(billSheetAddBo);
@@ -857,6 +862,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         for (OrderGoods orderGoods : freeList) {
             dealFreeGoods(orderGoods, add);
         }
+
         instTimeSettleOrder(add,DateUtils.getNowTime());
         Map<String, Object> result = new HashMap<>();
         result.put("orderId", add.getOrderId());

zhongzheng-system/src/main/resources/mapper/modules/order/OrderBusinessConfigMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="subjectId != null and subjectId != ''">
             and (SELECT COUNT(obcg.id) FROM order_business_config_goods obcg  where obcg.subject_id = #{subjectId} AND obcg.config_id = obc.id AND obcg.`status` = 1) > 0
         </if>
+        ORDER BY obc.config_sort DESC
     </select>
 
     <select id="getDetail" parameterType="com.zhongzheng.modules.order.bo.OrderBusinessConfigQueryBo" resultMap="OrderBusinessConfigVoResult">