fix

virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/OrderInfoService.java

@@ -7,6 +7,7 @@ import com.bosshand.virgo.api.workark.dao.ProceDao;
 import com.bosshand.virgo.api.workark.dao.ProductCouponDao;
 import com.bosshand.virgo.api.workark.dao.ProductDao;
 import com.bosshand.virgo.api.workark.enums.OrderStatus;
+import com.bosshand.virgo.api.workark.enums.PayType;
 import com.bosshand.virgo.api.workark.model.*;
 import com.bosshand.virgo.api.workark.util.OrderNoUtils;
 import com.bosshand.virgo.core.utils.ContextUtils;
@@ -188,7 +189,7 @@ public class OrderInfoService {
 
         OrderInfo orderInfo = orderInfoDao.getOrderNo(orderNo);
         orderInfo.setOrderStatus(orderStatus.getType());
-
+        orderInfo.setPaymentType(PayType.WXPAY.getType());
         orderInfoDao.update(orderInfo);
     }
 

virgo.api/src/main/resources/mapper/ProceMapper.xml

@@ -14,6 +14,7 @@
         <result column="sequence" property="sequence"/>
         <result column="attachment" property="attachment"/>
         <result column="attachmentNumber" property="attachmentNumber"/>
+        <result column="attachmentContent" property="attachmentContent"/>
         <result column="roleId" property="roleId"/>
         <result column="remark" property="remark"/>
         <result column="status" property="status"/>
@@ -36,8 +37,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.workark.model.ProceModel" useGeneratedKeys="true" keyProperty="id">
-        INSERT into workark_proce(name, parentId, orderId, productId, productLevelId, sequence, attachment, attachmentNumber, roleId, remark)
-        values(#{name}, #{parentId}, #{orderId}, #{productId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{roleId}, #{remark})
+        INSERT into workark_proce(name, parentId, orderId, productId, productLevelId, sequence, attachment, attachmentNumber, attachmentContent, roleId, remark)
+        values(#{name}, #{parentId}, #{orderId}, #{productId}, #{productLevelId}, #{sequence}, #{attachment}, #{attachmentNumber}, #{attachmentContent}, #{roleId}, #{remark})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.workark.model.ProceModel">
@@ -51,6 +52,7 @@
             <if test="attachment!=null">attachment=#{attachment},</if>
             <if test="roleId!=0">roleId=#{roleId},</if>
             <if test="remark!=null">remark=#{remark},</if>
+            <if test="attachmentContent!=null">attachmentContent=#{attachmentContent},</if>
             attachmentNumber=#{attachmentNumber},
             sequence=#{sequence},
         </trim>