查询图录

ch-admin-api/pom.xml

@@ -125,7 +125,6 @@
             <artifactId>spring-test</artifactId>
         </dependency>
 
-
     </dependencies>
 
     <build>

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/IdentifyOrderController.java

+package com.wwdz.ch.admin.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.admin.service.SysIdentifyOrderService;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/admin/identifyOrder")
+public class IdentifyOrderController {
+
+    private static final Logger logger = LoggerFactory.getLogger(ConsignSaleController.class);
+
+    @Autowired
+    SysIdentifyOrderService sysIdentifyOrderService;
+
+    @ApiOperation(value = "查询寄售单")
+    @PostMapping("/findList")
+    public Result findList(@RequestBody ConsignSaleRequestDto dto) {
+        return null;
+    }
+
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysIdentifyOrderServiceImpl.java

+package com.wwdz.ch.admin.impl;
+
+import com.wwdz.ch.admin.service.SysIdentifyOrderService;
+import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.entity.DeliveryNoticeMsg;
+import com.wwdz.ch.core.service.SendMsgService;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.DistributorProfitDao;
+import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.dto.request.distribution.IdentifyOrderRequestDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+
+@Service
+public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SysIdentifyOrderServiceImpl.class);
+
+    @Autowired
+    IdentifyOrderDao identifyOrderDao;
+
+    @Autowired
+    DistributionOrderDao distributionOrderDao;
+
+    @Autowired
+    DistributorProfitDao distributorProfitDao;
+
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
+    @Autowired
+    SendMsgService sendMsgService;
+
+    @Override
+    @Transactional
+    public Result identify(IdentifyOrderRequestDto dto) {
+        try {
+            IdentifyOrder identifyOrder = new IdentifyOrder();
+            identifyOrder.setIdentifyOrderId(dto.getIdentifyOrderId());
+            identifyOrder.setApproved(dto.getApproved());
+            if (dto.getApproved() == 1) {
+                identifyOrder.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_SEND.getCode());
+            } else {
+                //审核不通过
+                identifyOrder.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_RETURN.getCode());
+                identifyOrder.setRemark(dto.getRemark());
+
+                //藏馆订单状态修改为已取消
+                distributionOrderDao.updateState(dto.getDistributionOrderId(), DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode());
+                distributorProfitDao.updateValidState(dto.getDistributionOrderId(), false);
+            }
+            identifyOrder.setUpdateTime(new Date());
+            identifyOrderDao.update(identifyOrder);
+            return Result.success();
+        } catch (Exception e) {
+            logger.error("鉴定单审核 error:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        return Result.failed();
+    }
+
+    @Override
+    public Result delivery(IdentifyOrderRequestDto dto) {
+        try {
+            String distributionOrderId = dto.getDistributionOrderId();
+            DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
+            if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
+                return Result.failed("订单状态错误，不能发货");
+            }
+            Date now = new Date();
+            DistributionOrder orderUpdateDto = new DistributionOrder();
+            orderUpdateDto.setDistributionOrderId(distributionOrderId);
+            orderUpdateDto.setLogisticsCode(dto.getOutLogisticsCode());
+            orderUpdateDto.setWaybill(dto.getOutWaybill());
+            orderUpdateDto.setDeliveryTime(now);
+            orderUpdateDto.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode());
+            distributionOrderDao.update(orderUpdateDto);
+            //发货成功，发送模板信息通知买家
+            try {
+                DeliveryNoticeMsg deliveryNoticeMsg = new DeliveryNoticeMsg();
+                deliveryNoticeMsg.setDistributionOrderId(distributionOrderId);
+                deliveryNoticeMsg.setWaybill(dto.getOutLogisticsCode());
+                deliveryNoticeMsg.setAddress(distributionOrder.getReceiverName() + " " + distributionOrder.getReceiverPhone() + " " + distributionOrder.getReceiverAddress());
+                SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
+                deliveryNoticeMsg.setItemName(supplierItem.getName());
+                deliveryNoticeMsg.setDeliveryTime(now);
+
+                //发送给买家
+                String buyerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getBuyerId());
+                if (com.xxdxxs.utils.StringUtils.hasLength(buyerOpenId)) {
+                    deliveryNoticeMsg.setShopState(0);
+                    sendMsgService.sendDeliveryTempletMsg(buyerOpenId, deliveryNoticeMsg);
+                } else {
+                    logger.info(">>>>> 买家openid为空, 发送消息失败 <<<<<");
+                }
+            } catch (Exception e) {
+                logger.info("鉴定通过发货通知发送失败:{}", e);
+            }
+            return Result.success();
+        } catch (Exception e) {
+            logger.info("后台审核通过发货失败 error: {}", e);
+        }
+        return Result.failed();
+    }
+
+    @Override
+    public Result sendBack(IdentifyOrderRequestDto dto) {
+        return null;
+    }
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysIdentifyOrderService.java

@@ -18,4 +18,12 @@ public interface SysIdentifyOrderService {
      * @return
      */
     Result delivery(IdentifyOrderRequestDto dto);
+
+
+    /**
+     * 鉴定单审核不通过后退回寄出
+     * @param dto
+     * @return
+     */
+    Result sendBack(IdentifyOrderRequestDto dto);
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/IdentifyOrderDao.java

@@ -23,4 +23,9 @@ public interface IdentifyOrderDao {
 
     IdentifyOrder findById(String identifyOrderId);
 
+    IdentifyOrder findByDistributionOrderId(String distributionOrderId);
+
+
+    int updateState(String identifyOrderId, int state);
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/IdentifyOrder.java

@@ -8,10 +8,11 @@ import lombok.Data;
 
 /**
  * @author shiyu
- * @date   2024/05/07
+ * @date   2024/05/08
  */
 @Data
 public class IdentifyOrder implements Entity {
+
     private Integer id;
 
     /**
@@ -44,6 +45,13 @@ public class IdentifyOrder implements Entity {
      */
     private Integer state;
 
+    /**
+     * 审核结果
+     * 0不通过
+     * 1通过
+     */
+    private Integer approved;
+
     /**
      * 备注（鉴定不通过理由）
      */
@@ -99,6 +107,7 @@ public class IdentifyOrder implements Entity {
         sb.append(", fromLogisticsCode=").append(fromLogisticsCode);
         sb.append(", fromWaybill=").append(fromWaybill);
         sb.append(", state=").append(state);
+        sb.append(", approved=").append(approved);
         sb.append(", remark=").append(remark);
         sb.append(", outLogisticsCode=").append(outLogisticsCode);
         sb.append(", outWaybill=").append(outWaybill);
@@ -131,6 +140,7 @@ public class IdentifyOrder implements Entity {
             && (this.getFromLogisticsCode() == null ? other.getFromLogisticsCode() == null : this.getFromLogisticsCode().equals(other.getFromLogisticsCode()))
             && (this.getFromWaybill() == null ? other.getFromWaybill() == null : this.getFromWaybill().equals(other.getFromWaybill()))
             && (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
+            && (this.getApproved() == null ? other.getApproved() == null : this.getApproved().equals(other.getApproved()))
             && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
             && (this.getOutLogisticsCode() == null ? other.getOutLogisticsCode() == null : this.getOutLogisticsCode().equals(other.getOutLogisticsCode()))
             && (this.getOutWaybill() == null ? other.getOutWaybill() == null : this.getOutWaybill().equals(other.getOutWaybill()))
@@ -152,6 +162,7 @@ public class IdentifyOrder implements Entity {
         result = prime * result + ((getFromLogisticsCode() == null) ? 0 : getFromLogisticsCode().hashCode());
         result = prime * result + ((getFromWaybill() == null) ? 0 : getFromWaybill().hashCode());
         result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
+        result = prime * result + ((getApproved() == null) ? 0 : getApproved().hashCode());
         result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
         result = prime * result + ((getOutLogisticsCode() == null) ? 0 : getOutLogisticsCode().hashCode());
         result = prime * result + ((getOutWaybill() == null) ? 0 : getOutWaybill().hashCode());
@@ -178,6 +189,7 @@ public class IdentifyOrder implements Entity {
         fromLogisticsCode("from_logistics_code", "fromLogisticsCode", "VARCHAR", false),
         fromWaybill("from_waybill", "fromWaybill", "VARCHAR", false),
         state("state", "state", "INTEGER", true),
+        approved("approved", "approved", "INTEGER", false),
         remark("remark", "remark", "VARCHAR", false),
         outLogisticsCode("out_logistics_code", "outLogisticsCode", "VARCHAR", false),
         outWaybill("out_waybill", "outWaybill", "VARCHAR", false),

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/IdentifyOrderExample.java

@@ -1112,6 +1112,138 @@ public class IdentifyOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andApprovedIsNull() {
+            addCriterion("approved is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedIsNotNull() {
+            addCriterion("approved is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedEqualTo(Integer value) {
+            addCriterion("approved =", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved = ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedNotEqualTo(Integer value) {
+            addCriterion("approved <>", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedNotEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved <> ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedGreaterThan(Integer value) {
+            addCriterion("approved >", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedGreaterThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved > ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedGreaterThanOrEqualTo(Integer value) {
+            addCriterion("approved >=", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedGreaterThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved >= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedLessThan(Integer value) {
+            addCriterion("approved <", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedLessThanColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved < ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedLessThanOrEqualTo(Integer value) {
+            addCriterion("approved <=", value, "approved");
+            return (Criteria) this;
+        }
+
+        /**
+         * This method was generated by MyBatis Generator.
+         * This method corresponds to the database table identify_order
+         *
+         * @mbg.generated
+         * @project https://github.com/itfsw/mybatis-generator-plugin
+         */
+        public Criteria andApprovedLessThanOrEqualToColumn(IdentifyOrder.Column column) {
+            addCriterion(new StringBuilder("approved <= ").append(column.getEscapedColumnName()).toString());
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedIn(List<Integer> values) {
+            addCriterion("approved in", values, "approved");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedNotIn(List<Integer> values) {
+            addCriterion("approved not in", values, "approved");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedBetween(Integer value1, Integer value2) {
+            addCriterion("approved between", value1, value2, "approved");
+            return (Criteria) this;
+        }
+
+        public Criteria andApprovedNotBetween(Integer value1, Integer value2) {
+            addCriterion("approved not between", value1, value2, "approved");
+            return (Criteria) this;
+        }
+
         public Criteria andRemarkIsNull() {
             addCriterion("remark is null");
             return (Criteria) this;

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -156,4 +156,19 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
     private Integer type;
 
     private List<Integer> typeList;
+
+    /**
+     * 退回收货人名称
+     */
+    private String returnName;
+
+    /**
+     * 退回收货人电话
+     */
+    private String returnPhone;
+
+    /**
+     * 退回收货人地址
+     */
+    private String returnAddress;
 }

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/IdentifyOrderRequestDto.java

@@ -41,6 +41,13 @@ public class IdentifyOrderRequestDto extends BaseRequestDto implements Entity {
      */
     private Integer state;
 
+    /**
+     * 审核结果
+     * 0不通过
+     * 1通过
+     */
+    private Integer approved;
+
     /**
      * 备注（鉴定不通过理由）
      */

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/IdentifyOrderDaoImpl.java

@@ -38,4 +38,23 @@ public class IdentifyOrderDaoImpl implements IdentifyOrderDao {
         criteria.andIdentifyOrderIdEqualTo(identifyOrderId);
         return identifyOrderMapper.selectOneByExample(example);
     }
+
+    @Override
+    public IdentifyOrder findByDistributionOrderId(String distributionOrderId) {
+        IdentifyOrderExample example = new IdentifyOrderExample();
+        IdentifyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andDistributionOrderIdEqualTo(distributionOrderId);
+        return identifyOrderMapper.selectOneByExample(example);
+    }
+
+    @Override
+    public int updateState(String identifyOrderId, int state) {
+        IdentifyOrderExample example = new IdentifyOrderExample();
+        IdentifyOrderExample.Criteria criteria = example.createCriteria();
+        criteria.andIdentifyOrderIdEqualTo(identifyOrderId);
+        IdentifyOrder identifyOrder = new IdentifyOrder();
+        identifyOrder.setState(state);
+        identifyOrder.setUpdateTime(new Date());
+        return identifyOrderMapper.updateByExampleSelective(identifyOrder, example);
+    }
 }

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/IdentifyOrderMapper.xml

@@ -9,6 +9,7 @@
     <result column="from_logistics_code" jdbcType="VARCHAR" property="fromLogisticsCode" />
     <result column="from_waybill" jdbcType="VARCHAR" property="fromWaybill" />
     <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="approved" jdbcType="INTEGER" property="approved" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="out_logistics_code" jdbcType="VARCHAR" property="outLogisticsCode" />
     <result column="out_waybill" jdbcType="VARCHAR" property="outWaybill" />
@@ -78,8 +79,8 @@
   </sql>
   <sql id="Base_Column_List">
     id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
-    `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
-    create_time, update_time
+    `state`, approved, remark, out_logistics_code, out_waybill, return_name, return_phone, 
+    return_address, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrderExample" resultMap="BaseResultMap">
     select
@@ -108,15 +109,15 @@
       distinct
     </if>
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
         id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
-          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
-          create_time, update_time
+          `state`, approved, remark, out_logistics_code, out_waybill, return_name, return_phone, 
+          return_address, create_time, update_time
       </otherwise>
     </choose>
     from identify_order
@@ -141,15 +142,15 @@
     -->
     select
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
         id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
-          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
-          create_time, update_time
+          `state`, approved, remark, out_logistics_code, out_waybill, return_name, return_phone, 
+          return_address, create_time, update_time
       </otherwise>
     </choose>
     from identify_order
@@ -171,16 +172,16 @@
     </selectKey>
     insert into identify_order (distribution_order_id, identify_order_id, 
       item_id, from_logistics_code, from_waybill, 
-      `state`, remark, out_logistics_code, 
-      out_waybill, return_name, return_phone, 
-      return_address, create_time, update_time
-      )
+      `state`, approved, remark, 
+      out_logistics_code, out_waybill, return_name, 
+      return_phone, return_address, create_time, 
+      update_time)
     values (#{distributionOrderId,jdbcType=VARCHAR}, #{identifyOrderId,jdbcType=VARCHAR}, 
       #{itemId,jdbcType=BIGINT}, #{fromLogisticsCode,jdbcType=VARCHAR}, #{fromWaybill,jdbcType=VARCHAR}, 
-      #{state,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{outLogisticsCode,jdbcType=VARCHAR}, 
-      #{outWaybill,jdbcType=VARCHAR}, #{returnName,jdbcType=VARCHAR}, #{returnPhone,jdbcType=VARCHAR}, 
-      #{returnAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{state,jdbcType=INTEGER}, #{approved,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{outLogisticsCode,jdbcType=VARCHAR}, #{outWaybill,jdbcType=VARCHAR}, #{returnName,jdbcType=VARCHAR}, 
+      #{returnPhone,jdbcType=VARCHAR}, #{returnAddress,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.IdentifyOrder">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
@@ -206,6 +207,9 @@
       <if test="state != null">
         `state`,
       </if>
+      <if test="approved != null">
+        approved,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -250,6 +254,9 @@
       <if test="state != null">
         #{state,jdbcType=INTEGER},
       </if>
+      <if test="approved != null">
+        #{approved,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
@@ -306,6 +313,9 @@
       <if test="record.state != null">
         `state` = #{record.state,jdbcType=INTEGER},
       </if>
+      <if test="record.approved != null">
+        approved = #{record.approved,jdbcType=INTEGER},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
@@ -344,6 +354,7 @@
       from_logistics_code = #{record.fromLogisticsCode,jdbcType=VARCHAR},
       from_waybill = #{record.fromWaybill,jdbcType=VARCHAR},
       `state` = #{record.state,jdbcType=INTEGER},
+      approved = #{record.approved,jdbcType=INTEGER},
       remark = #{record.remark,jdbcType=VARCHAR},
       out_logistics_code = #{record.outLogisticsCode,jdbcType=VARCHAR},
       out_waybill = #{record.outWaybill,jdbcType=VARCHAR},
@@ -377,6 +388,9 @@
       <if test="state != null">
         `state` = #{state,jdbcType=INTEGER},
       </if>
+      <if test="approved != null">
+        approved = #{approved,jdbcType=INTEGER},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
@@ -412,6 +426,7 @@
       from_logistics_code = #{fromLogisticsCode,jdbcType=VARCHAR},
       from_waybill = #{fromWaybill,jdbcType=VARCHAR},
       `state` = #{state,jdbcType=INTEGER},
+      approved = #{approved,jdbcType=INTEGER},
       remark = #{remark,jdbcType=VARCHAR},
       out_logistics_code = #{outLogisticsCode,jdbcType=VARCHAR},
       out_waybill = #{outWaybill,jdbcType=VARCHAR},
@@ -449,15 +464,15 @@
     select
     'true' as QUERYID,
     <choose>
-      <when test="selective != null and selective.length > 0">
+      <when test="selective != null and selective.length &gt; 0">
         <foreach collection="selective" item="column" separator=",">
           ${column.escapedColumnName}
         </foreach>
       </when>
       <otherwise>
         id, distribution_order_id, identify_order_id, item_id, from_logistics_code, from_waybill, 
-          `state`, remark, out_logistics_code, out_waybill, return_name, return_phone, return_address, 
-          create_time, update_time
+          `state`, approved, remark, out_logistics_code, out_waybill, return_name, return_phone, 
+          return_address, create_time, update_time
       </otherwise>
     </choose>
     from identify_order

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -114,6 +114,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
     @Autowired
     CollectionShareRecordDao collectionShareRecordDao;
 
+    @Autowired
+    IdentifyOrderDao identifyOrderDao;
+
     @Transactional
     @Override
     public Result createDistributionOrder(DistributionOrderRequestDto dto) {
@@ -478,6 +481,10 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributorProfit.setIsValid(false);
             distributorProfitDao.insert(distributorProfit);
 
+            //创建鉴定单
+            /**
+             *
+             */
 
             return Result.success(map);
         } catch (Exception e) {
@@ -683,7 +690,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             if (distributionOrder.getState() != DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
                 return Result.failed("订单状态错误，不能发货");
             }
-            Date now = new Date();
+            IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrderId);
+            //修改鉴定单状态。待平台收货
+            IdentifyOrder updateDto = new IdentifyOrder();
+            updateDto.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
+            updateDto.setFromLogisticsCode(dto.getLogisticsCode());
+            updateDto.setFromWaybill(dto.getWaybill());
+            updateDto.setReturnName(dto.getReturnName());
+            updateDto.setReturnAddress(dto.getReturnAddress());
+            updateDto.setReturnPhone(dto.getReturnPhone());
+            updateDto.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_RECEIVE.getCode());
+            identifyOrderDao.update(updateDto);
+
+
+          /*  Date now = new Date();
             DistributionOrder orderUpdateDto = new DistributionOrder();
             orderUpdateDto.setDistributionOrderId(distributionOrderId);
             orderUpdateDto.setLogisticsCode(dto.getLogisticsCode());
@@ -726,7 +746,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 }
             } catch (Exception e) {
                 logger.info("分销订单发货通知模板信息发送失败:{}", e);
-            }
+            }*/
             return Result.success();
         } catch (Exception e) {
             logger.info("发货失败 error: {}", e);