Submit by Strive

Date 2021/04/09
Project End

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html

@@ -1105,8 +1105,8 @@
                     "aTargets": [3],
                     "mData": "userName",
                     "mRender": function (a, b, c, d) {
-                        if (c) {
-                            return c.userName.slice(0, 1) + '*' + c.userName.slice(2, c.userName.length);
+                        if (a) {
+                            return a.slice(0, 1) + '*' + a.slice(2, a.length);
                         } else {
                             return null;
                         }

aidea-modules/couponrecord-module-web/src/main/webapp/WEB-INF/views/couponrecord/couponrecordlist.html

@@ -76,7 +76,7 @@
                 <div class="col-xs-12">
                     <div class="box">
                         <div class="box-header">
-                            <form id="seachTableForm" action="#springUrl('/a/couponrecord/list')" method="get">
+                            <form id="seachTableForm" action="#springUrl('/a/couponrecord/exportExcel')" method="get">
                                 <div class="col-xs-2">
                                     <input type="text" class="form-control"
                                            name="number" placeholder="检测券编码">
@@ -100,7 +100,7 @@
                                 <div class="col-xs-5">
                                     <button type="button" class="search btn btn-primary">搜索</button>
                                     #if($shiro.hasPermission("qy:couponrecord:edit"))
-                                    <a href="#springUrl('/a/couponrecord/exportExcel')" class="btn btn-primary">导出</a>
+                                    <button type="submit" class="btn btn-primary">导出</button>
                                     #end
                                 </div>
                             </form>

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.xml

@@ -140,10 +140,11 @@
 
     <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
         SELECT
-        <include refid="sqlColumns"/>, c.name couponName, f.nickname nickName
+        <include refid="sqlColumns"/>, c.name couponName, f.nickname nickName, h.name hospitalName
         FROM t_aidea_coupon_record t
         LEFT JOIN t_aidea_check_coupon c ON t.coupon_id = c.id
         LEFT JOIN wx_mp_fanss f ON f.openid = t.openid AND f.delflag = '0'
+        LEFT JOIN t_aidea_hospital h ON t.hospital_id = h.id AND h.del_flag = '0'
         <include refid="sqlWhere"/>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/model/Couponrecord.java

@@ -62,8 +62,10 @@ public class Couponrecord implements Serializable {
     /* 删除标识 */
     private boolean delFlag;
     /* 状态 */
+    @ExportConfig(value = "状态", width = 100, showLevel = 1)
     private String status;
     /* 创建时间 */
+    @ExportConfig(value = "发放日期", width = 100, showLevel = 1, dateFormat = "yyyy-MM-dd")
     private Date createTime;
     /* 更新时间 */
     private Date updateTime;
@@ -78,7 +80,9 @@ public class Couponrecord implements Serializable {
 
     //未映射字段
     private String couponName;
+    @ExportConfig(value = "粉丝昵称", width = 100, showLevel = 1)
     private String nickName;
+    @ExportConfig(value = "核销医院", width = 100, showLevel = 1)
     private String hospitalName;
 
     public Couponrecord() {

aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/web/CouponrecordController.java

@@ -159,6 +159,24 @@ public class CouponrecordController {
             conds.equal("t.status", couponrecord.getStatus());
         }
         List<Couponrecord> list = couponrecordService.fetchSearchByPage(conds, sort, 0, 0);
+        for (Couponrecord c : list) {
+            switch (c.getStatus()) {
+                case "0":
+                    c.setStatus("未激活");
+                    break;
+                case "1":
+                    c.setStatus("待核销");
+                    break;
+                case "2":
+                    c.setStatus("已核销");
+                    break;
+                case "3":
+                    c.setStatus("已过期");
+                    break;
+                default:
+                    c.setStatus("");
+            }
+        }
         ExcelKit.$Export(Couponrecord.class, response).toExcel(list, "发券信息管理信息");
     }
 

aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java

@@ -543,8 +543,8 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                         order.setStatus("2");//待发货
                         order.setTradeNo(transaction_id);
                         //现金支付总金额
-                        if (StringUtils.isNoneBlank(map.get("cash_fee"))) {
-                            order.setPayAmount(Double.parseDouble(map.get("cash_fee")));
+                        if (StringUtils.isNoneBlank(map.get("total_fee"))) {
+                            order.setPayAmount(Double.parseDouble(map.get("total_fee")));
                         }
                         //支付完成时间
                         if (StringUtils.isNoneBlank(time_end)) {

aidea-modules/reportform-module/src/main/java/com/cftech/report/dao/ReportMapper.xml

@@ -302,7 +302,7 @@
         CONVERT ( AES_DECRYPT( consult.phone, 'aideakey' ) USING UTF8 ) phone,
         qyuser.`name` cfDoctor,
         org1.org_name cfHospital,
-        ord.create_time fkTime,
+        ord.pay_time fkTime,
         waybill.send_express_date fhTime,
         waybill.accept_express_date sjTime,
         ord.openid openId